[Lunar-commits] r14822 - in lunar-iso/trunk: . lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2005-05-18 20:01:41 +0000 (Wed, 18 May 2005)
New Revision: 14822

Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
lilo.conf fix plus a dependency in the Makefile.


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2005-05-18 19:45:36 UTC (rev 14821)
+++ lunar-iso/trunk/Makefile	2005-05-18 20:01:41 UTC (rev 14822)
@@ -48,7 +48,7 @@
 	@echo "Generating static discover"
 	@scripts/discover
 
-kernels: $(ISO_SOURCE)/kernels/.kernels
+kernels: rebuild $(ISO_SOURCE)/kernels/.kernels
 $(ISO_SOURCE)/kernels/.kernels:
 	@echo "Building precompiled kernels"
 	@scripts/kernels

Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-18 19:45:36 UTC (rev 14821)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-18 20:01:41 UTC (rev 14822)
@@ -453,14 +453,20 @@
 
 make_lilo_conf()
 {
-    if [ ! -f $TARGET/etc/lilo.conf ]; then
-        cp /etc/lilo.conf $TARGET/etc/lilo.conf
-    fi
     DISC=$(echo $ROOT | sed 's/part.*/disc/')
-    echo "" >> $TARGET/etc/lilo.conf
-    echo "boot=$(reverse_device /dev/discs/$DISC)" >> $TARGET/etc/lilo.conf
-    echo "root=$(reverse_device /dev/discs/$ROOT)" >> $TARGET/etc/lilo.conf
-    echo "" >> $TARGET/etc/lilo.conf
+    (
+      echo "# lba32"
+      echo "prompt"
+      echo "delay=100"
+      echo "timeout=100"
+      echo "install=menu"
+      echo "append=\"devfs=nomount\""
+      echo "read-only"
+      echo ""
+      echo "boot=$(reverse_device /dev/discs/$DISC)"
+      echo "root=$(reverse_device /dev/discs/$ROOT)"
+      echo ""
+    ) > $TARGET/etc/lilo.conf
 }