From b2a538c1cc53ae3f58687dba5696ed5cf4b68ce8 Mon Sep 17 00:00:00 2001 From: Tom Elliott Date: Mon, 9 Jan 2017 17:17:22 -0500 Subject: [PATCH] Update ntfsresize if fails Try to reset the ntfsresize by trying out a fixed size method. While it may not have been intended to be a fixed size, it obviously isn't suited for resizing anyway. --- packages/web/lib/fog/system.class.php | 2 +- packages/web/management/languages/messages.pot | 2 +- .../package/fog/scripts/usr/share/fog/lib/funcs.sh | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index 771e391ce6..bbcee3cc48 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '9'); + define('FOG_VERSION', '10'); define('FOG_SCHEMA', 245); define('FOG_BCACHE_VER', 111); define('FOG_SVN_REVISION', 6052); diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot index 7e8f329078..e9222392da 100644 --- a/packages/web/management/languages/messages.pot +++ b/packages/web/management/languages/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 15:24-0500\n" +"POT-Creation-Date: 2017-01-09 17:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh b/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh index e6f574ce50..b1c4837c5d 100644 --- a/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh +++ b/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh @@ -454,7 +454,11 @@ shrinkPartition() { ntfs) ntfsresize -f -i -v -P $part >/tmp/tmpoutput.txt 2>&1 if [[ ! $? -eq 0 ]]; then - handleError " * (${FUNCNAME[0]})\n Args Passed: $*\n\nFatal Error, unable to find size data out on $part. Cmd: ntfsresize -f -i -v -P $part" + echo " * Not shrinking ($part) trying fixed size" + debugPause + echo "$(cat "$imagePath/d1.fixed_size_partitions"):${part_number}" > "$imagePath/d1.fixed_size_partitions" + return + #handleError " * (${FUNCNAME[0]})\n Args Passed: $*\n\nFatal Error, unable to find size data out on $part. Cmd: ntfsresize -f -i -v -P $part" fi tmpoutput=$(cat /tmp/tmpoutput.txt) size=$(cat /tmp/tmpoutput.txt | grep "You might resize" | cut -d" " -f5)