Add suggestion of what to check.

If uploads fail, it's most likely lost connection to the NFS, network, or the server's disk space is getting full. Add this suggestion for how to troubleshoot this issue. Return savePartition error code too for more helpful debugging/checking/troubleshooting. Return the proper exit code on savePartition errors. It would always return 0 becuase the $? was called earlier.
FOGProject · Jan 10, 2017 · de79515 · de79515
1 parent 26002ad
commit de79515
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 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', '11');
+        define('FOG_VERSION', '12');
         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 18:57-0500\n"
+"POT-Creation-Date: 2017-01-09 19:52-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
@@ -677,7 +677,8 @@ writeImage()  {
         echo " * Imaging using Partclone"
         pigz -d -c </tmp/pigz1 | partclone.restore --ignore_crc -O $target -N -f 1
     fi
-    [[ ! $? -eq 0 ]] && handleError "Image failed to restore and exited with exit code $? (${FUNCNAME[0]})\n   Args Passed: $*"
+    exitcode=$?
+    [[ ! $exitcode -eq 0 ]] && handleError "Image failed to restore and exited with exit code $exitcode (${FUNCNAME[0]})\n   Args Passed: $*"
     rm -rf /tmp/pigz1 >/dev/null 2>&1
 }
 # Gets the valid restore parts. They're only
@@ -1996,13 +1997,14 @@ savePartition() {
                     imgpart="$imagePath/d${disk_number}p${part_number}.img"
                     uploadFormat "$fifoname" "$imgpart"
                     partclone.$fstype -fsck-src-part -c -s $part -O $fifoname -N -f 1
-                    case $? in
+                    exitcode=$?
+                    case $exitcode in
                         0)
                             mv ${imgpart}.000 $imgpart >/dev/null 2>&1
                             echo " * Image Captured"
                             ;;
                         *)
-                            handleError "Failed to complete capture (${FUNCNAME[0]})\n   Args Passed: $*"
+                            handleError "Failed to complete capture (${FUNCNAME[0]})\n   Args Passed: $*\n    Exit code: $exitcode\n    Maybe check the fog server\n      to ensure disk space is good to go?"
                             ;;
                     esac
                     ;;