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.
FOGProject · Jan 9, 2017 · b2a538c · b2a538c
1 parent e361c76
commit b2a538c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -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)