[Devil-linux-commit] build/scripts/scripts save-config,1.24,1.25

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv19113/build/scripts/scripts

Modified Files:
	save-config 
Log Message:
cosmetic changes


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- save-config	23 Dec 2003 16:05:33 -0000	1.24
+++ save-config	25 Dec 2003 15:10:27 -0000	1.25
@@ -52,6 +52,8 @@
 					else
 						umount $CONFIG_MOUNT
 					fi
+				else
+					continue 2
 				fi
 			else
 				beep;
@@ -84,16 +86,18 @@
 $NORMAL
 
 until [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; do
-    if mount $DL_CONFIG_SOURCE $CONFIG_MOUNT 2>&1 >/dev/null  ; then
-	if [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; then
-	    continue
-	else
-	    umount $CONFIG_MOUNT
+	if mount $DL_CONFIG_SOURCE $CONFIG_MOUNT 2>&1 >/dev/null  ; then
+		if [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; then
+			continue
+		else
+			umount $CONFIG_MOUNT
+		fi
 	fi
-    fi
-    beep;beep;
-    echo "Please insert Configuration Media"
-    sleep 2
+	beep;beep;
+	$FAILURE
+	echo "Please insert Configuration Media in $DL_CONFIG_SOURCE"
+	$NORMAL
+	sleep 2
 done
 
 if [ -z "$QUIET" ]; then
@@ -105,11 +109,12 @@
 	umount $CONFIG_MOUNT
 
 	$FAILURE
-	echo "press the 'anykey' to save the configuration or CTRL+C to quit"
+	echo "Do you still want to save?"
 	$NORMAL
-	read -n 1 -rs ANS
+	if ! ask_yes_no ; then
+		exit 1
+	fi
 fi
-$NORMAL
 
 umount $CONFIG_MOUNT &> /dev/null