[Lunar-commits] r14850 - lunar-iso/trunk/lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2005-05-19 21:45:39 +0000 (Thu, 19 May 2005)
New Revision: 14850

Modified:
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
Adjusted to the move of the device mapping code to the grub plugin.


Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-19 21:44:54 UTC (rev 14849)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-19 21:45:39 UTC (rev 14850)
@@ -152,7 +152,7 @@
     LIST=$(ls /dev/discs)
     for LINE in $LIST; do
         echo "$LINE"
-        echo "$(reverse_device /dev/discs/$LINE) - disk"
+        echo "$(lsh unmap_device "/dev/discs/$LINE") - disk"
     done
 }
 
@@ -181,11 +181,11 @@
 	        if echo ${PARTITIONS[$N]} | grep -q "^$PART:"; then
 		    FSTYPE=$(echo ${PARTITIONS[$N]} | cut -d: -f2)
 		    MNTPNT=$(echo ${PARTITIONS[$N]} | cut -d: -f3)
-		    echo "$(reverse_device /dev/discs/$PART) - $FSTYPE partition, size $FSIZE"
+		    echo "$(lsh unmap_device /dev/discs/$PART) - $FSTYPE partition, size $FSIZE"
 		    continue 2
 		fi		
 	    done
-            echo "$(reverse_device /dev/discs/$PART) - unassigned, size $FSIZE, $PTYPE"
+            echo "$(lsh unmap_device /dev/discs/$PART) - unassigned, size $FSIZE, $PTYPE"
         fi
     done
 }
@@ -458,27 +458,13 @@
       echo "append=\"devfs=nomount\""
       echo "read-only"
       echo ""
-      echo "boot=$(reverse_device /dev/discs/$DISC)"
-      echo "root=$(reverse_device /dev/discs/$ROOT)"
+      echo "boot=$(lsh unmap_device /dev/discs/$DISC)"
+      echo "root=$(lsh unmap_device /dev/discs/$ROOT)"
       echo ""
     ) > $TARGET/etc/lilo.conf
 }
 
 
-reverse_device()
-{
-    local DEVICE
-    for DEVICE in $(ls -1d /dev/[hs]d* 2> /dev/null); do
-        if [ "$(readlink -f $DEVICE)" == "$(readlink -f $1)" ]; then
-	    echo $DEVICE
-	    return 0
-	fi
-    done
-    echo $1
-    return 0
-}
-
-
 make_grub_conf()
 {
     (
@@ -488,8 +474,6 @@
 	echo "fallback 1"
 	echo "color light-gray/blue black/light-gray"
 	echo ""
-	echo "kopt=root=$(reverse_device /dev/discs/$ROOT) ro"
-	echo ""
     ) > $TARGET/boot/grub/menu.lst
 }
 
@@ -1029,7 +1013,9 @@
 		install_grub
 		$DIALOG --cr-wrap --msgbox "The grub boot loader package was installed. From now on, when you add a kernel, it will be available through grub on boot." 10 65
 		;;
-	    N) $DIALOG --cr-wrap --msgbox "Not installing a boot loader requires you to create a boot floppy, or configure your bootloader manually using another installed operating system. Lunar also does not install lilo or grub on the hard disc." 12 65 ;;
+	    N)
+	        $DIALOG --cr-wrap --msgbox "Not installing a boot loader requires you to create a boot floppy, or configure your bootloader manually using another installed operating system. Lunar also does not install lilo or grub on the hard disc." 12 65
+	        ;;
         esac
 
 	if (( STEP == 7 )); then