[Devil-linux-commit] build/scripts/scripts apcupsd,1.1,1.2 save-config,1.26,1.27

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

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

Modified Files:
	apcupsd save-config 
Log Message:
Roland: here is a small patch which polishes up apcupsd a  bit and fixes save-config 
when an empty medium is inserted (/cdrom/config was changed to /config)


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- save-config	4 Mar 2004 16:13:53 -0000	1.26
+++ save-config	1 Apr 2004 01:56:21 -0000	1.27
@@ -64,7 +64,7 @@
 				echo -n "Should I copy default configuration to it?"
 				if ask_yes_no ; then
 					mount -t auto $CFG_SRC $CONFIG_MOUNT >/dev/null 2>&1
-					cp -i /cdrom/config/etc.tar.bz2 $CONFIG_MOUNT/
+					cp -i /config/etc.tar.bz2 $CONFIG_MOUNT/
 					DL_CONFIG_SOURCE=$CFG_SRC
 					continue 2
 				fi

Index: apcupsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/apcupsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apcupsd	15 Mar 2004 01:22:52 -0000	1.1
+++ apcupsd	1 Apr 2004 01:56:21 -0000	1.2
@@ -48,8 +48,7 @@
 		rm -f /etc/apcupsd/powerfail
 	    	rm -f /etc/nologin
 		echo -n "Starting $NAME"
-		$DAEMON $PARAMETER &> /dev/null &
-		evaluate_retval
+		loadproc $DAEMON $PARAMETER
 		touch /var/lock/subsys/apcupsd
 	;;
         stop)