[Devil-linux-commit] build/scripts/scripts save-config, 1.29.2.6, 1.29.2.7

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14849/scripts/scripts

Modified Files:
      Tag: rel-1-2-patches
	save-config 
Log Message:
save-config did not correctly handle errors


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -d -r1.29.2.6 -r1.29.2.7
--- save-config	24 Oct 2007 21:40:13 -0000	1.29.2.6
+++ save-config	3 Nov 2007 19:56:24 -0000	1.29.2.7
@@ -274,14 +274,19 @@
   --exclude=lvm/archive \
   --exclude=lvm/backup \
   --exclude=lvm/cache \
-  --format=oldgnu \
-    etc root -f - | bzip2 -s -c > $CONFIG_MOUNT/$DL_CONFIG_FILE
+  -j \
+  -f $CONFIG_MOUNT/$DL_CONFIG_FILE \
+  etc root
 
 error=$?
 
 if [ $error -eq 141 ]; then
+	$RED
+	beep
 	echo "media protected, configuration not saved"
+	$NORMAL
 else
+    if [ $error -eq 0 ]; then
 	chmod 0600 $CONFIG_MOUNT/$DL_CONFIG_FILE
 	$SUCCESS
 	echo "Configuration saved"
@@ -291,6 +296,12 @@
 	# useful for backing up the config elsewhere
 	# Pass device and file name just saved
 	[ -x /root/bin/post-save-config ] && /root/bin/post-save-config $DL_CONFIG_SOURCE $CONFIG_MOUNT $DL_CONFIG_FILE
+    else
+	$RED
+	beep
+	echo "failed to save configuration"
+	$NORMAL
+    fi
 fi
 
 sync;sync;sync