[Lunar-commits] CVS: lunar-iso/lunar-install/sbin lunar-install, 1.5, 1.6

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso/lunar-install/sbin
In directory espresso.foo-projects.org:/tmp/cvs-serv27184/lunar-install/sbin

Modified Files:
	lunar-install 
Log Message:
Merginf in nestu's kernel-version related code, as well as some fixes and small additions to the build code


Index: lunar-install
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/lunar-install/sbin/lunar-install,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lunar-install	20 Mar 2005 21:40:27 -0000	1.5
+++ lunar-install	27 Mar 2005 16:49:29 -0000	1.6
@@ -406,8 +406,6 @@
 
         if [ "$MNTPNT" == "/" ]; then
             ROOT=$PART
-        elif [ "$MNTPNT" == "/boot" ]; then
-            BOOT=$PART
         fi
     done
 }
@@ -442,23 +440,18 @@
 }
 
 
-
 make_lilo_conf()
 {
     if [ ! -f $TARGET/etc/lilo.conf ]; then
         cp /etc/lilo.conf $TARGET/etc/lilo.conf
     fi
-    if [ -z "$BOOT" ]; then
-        BOOT=${ROOT/part[0-9]*/disc}
-    fi
     echo "" >> $TARGET/etc/lilo.conf
-    echo "boot=/dev/discs/$BOOT" >> $TARGET/etc/lilo.conf
+    echo "boot=/dev/discs/disc" >> $TARGET/etc/lilo.conf
     echo "root=/dev/discs/$ROOT" >> $TARGET/etc/lilo.conf
     echo "" >> $TARGET/etc/lilo.conf
 }
 
 
-
 transfer()
 {
     $DIALOG --msgbox "You should now be ready to install lunar to your system. Lunar will now create filesystems if needed, make a swapfile if it was selected, and install all lunar packages to the newly setup system. Make sure you are done with partitioning and filesystem selection." 12 60
@@ -490,12 +483,6 @@
 		            $DIALOG --msgbox "Problem creating filesystem on /dev/discs/$PART. Installation will continue." 8 50
 		        fi
     	            fi
-		    # then mount if needed and make fstab lines
-		    if [ "$MNT_OPTS" != "defaults" ]; then
-		        MNT_OPTS="-o $MNT_OPTS"
-		    else
-		        MNT_OPTS=
-		    fi
 		    # again, weed out swap first
 		    if [ "$FSYS" == "swap" ]; then
 		        if swapon /dev/discs/$PART; then
@@ -505,8 +492,8 @@
 		            $DIALOG --msgbox "Problem mounting swap on /dev/discs/$PART. Installation will continue." 8 50
 			fi
 		    # then try to mount normal FS's
-		    elif mkdir -p $TARGET$MOUNTPOINT && mount -n -t $FSYS /dev/discs/$PART $TARGET$MOUNTPOINT $MNT_OPTS &> /dev/null; then
-		        FSTAB="$FSTAB\n/dev/discs/$PART\t$MOUNTPOINT\t$FSYS\t$MNT_OPTS\t\t0 $FSCK_PASS"
+		    elif mkdir -p $TARGET$MOUNTPOINT && mount -n -t $FSYS /dev/discs/$PART $TARGET$MOUNTPOINT ${MNT_OPTS:+ -o $MNT_OPTS} &> /dev/null; then
+		        FSTAB="$FSTAB\n/dev/discs/$PART\t$MOUNTPOINT\t$FSYS\t${MNT_OPTS:-defaults}\t0 $FSCK_PASS"
 		    else
 		        sleep 3
 		        $DIALOG --msgbox "Problem mounting filesystem on /dev/discs/$PART. Installation will continue." 8 50
@@ -556,14 +543,14 @@
         (
             if [ -f /var/cache/lunar/aaa_base.tar.bz2 ]; then
 		echo XXX
-	        echo 1
+	        echo $(( 1 * 100 / $NUM ))
 	        echo "\nInstalling aaa_base: base directories and files\n"
 		echo XXX
 	        tar xjf /var/cache/lunar/aaa_base.tar.bz2 2> /dev/null
             fi
 	    if [ -f /var/cache/lunar/aaa_dev.tar.bz2 ]; then
 	        echo XXX
-		echo 2
+	        echo $(( 2 * 100 / $NUM ))
 		echo "\nInstalling aaa_dev: device nodes\n"
 		echo XXX
 		tar xjf /var/cache/lunar/aaa_dev.tar.bz2 2> /dev/null
@@ -581,7 +568,7 @@
             done
             if [ -f /var/lib/lunar/moonbase.tar.bz2 ] ; then
 		echo XXX
-	        echo 99
+	        echo $(( CNT * 100 / NUM ))
                 echo "\nInstalling moonbase"
 		echo XXX
                   (