[Devil-linux-commit] build/scripts/scripts install-on-usb, 1.30, 1.31

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv811

Modified Files:
	install-on-usb 
Log Message:

- fixed bug in serial console installer


Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- install-on-usb	4 Feb 2009 23:24:46 -0000	1.30
+++ install-on-usb	30 Jun 2009 03:59:40 -0000	1.31
@@ -483,25 +483,26 @@
 		cp -a $TMPDIR/iso-mnt/etc-cd/{inittab,securetty} $TMPDIR/etc-for-mods/etc-mods/ || ( echo -e $MESSAGE ; return 1; )
 	fi
 			
-	if [ -f $TMPDIR/etc-for-mods/etc-mods/inittab ]; then
-		modify_inittab || return 1; 
-	else
+	if [ ! -f $TMPDIR/etc-for-mods/etc-mods/inittab ]; then
 		cp -a $TMPDIR/iso-mnt/etc-cd/inittab $TMPDIR/etc-for-mods/etc-mods/inittab ||
 		( echo -e "Please configure login via serial console ttyS0 manually. \nAdd the following line to /etc/inittab:\n\tS0:2345:respawn:/sbin/agetty -L $SERIALSPEED ttyS0 vt102\n"; )
-		modify_inittab || return 1;
 	fi
+		modify_inittab || return 1; 
    	
-	if [ -f $TMPDIR/etc-for-mods/etc-mods/securetty ]; then
-		modify_securetty || return 1;
-	else
+	if [ ! -f $TMPDIR/etc-for-mods/etc-mods/securetty ]; then
 		cp -a $TMPDIR/iso-mnt/etc-cd/securetty $TMPDIR/etc-for-mods/etc-mods/securetty || \
 			( "Please configure login via serial console ttyS0 manually. \nAdd the following line to /etc/securetty:\n\tttyS0\n"; return 1)
+	fi
 		modify_securetty || return 1;
+
+	# There can be 2 dirs in the config tarball - "etc-mods" and "root" and but  "root" dir is optional 	
+	if [ -d $TMPDIR/etc-for-mods/root ]; then
+		local DIRS="root"
 	fi
 
-	tar -C $TMPDIR/etc-for-mods -c -j -f $TMPDIR/etc-mnt/etc-mods.tar.bz2.new  etc-mods root  && \
-		mv $TMPDIR/etc-mnt/etc-mods.tar.bz2.new $TMPDIR/etc-mnt/etc-mods.tar.bz2 || \
-		( echo "Unable to unpack etc-mods.tar.bz2...";  return 1; )
+	tar -c -j -f $TMPDIR/etc-mnt/etc-mods.tar.bz2.new -C $TMPDIR/etc-for-mods etc-mods $DIRS && \
+		mv -f $TMPDIR/etc-mnt/etc-mods.tar.bz2.new $TMPDIR/etc-mnt/etc-mods.tar.bz2 || \
+		( echo "Unable to repack etc-mods.tar.bz2...";  return 1; )
 
 	return 0