Changeset 222 for trunk

Timestamp:

Oct 28, 2007, 4:14:48 AM (17 years ago)

Author:

price

Message:

simplify isolinux.cfg.

Once we fix the problem of rebooting with the CD mounted again,
we can remove the prompt, so the user doesn't have to touch the console.
Until then, they need an opportunity to destroy/reboot-without-CD
after the installation finishes.

Location:

trunk/packages/sipb-xen-guest-installer/sipb-xen-guest-installer

Files:

• debian/sipb-xen-guest-installer.postinst (modified) (2 diffs)
• files/srv/guest-installer/etch/cdrom.patch (modified) (1 diff)
• files/srv/guest-installer/etch/cdrom.supplement (added)
• files/srv/guest-installer/etch/cdrom.supplement/isolinux (added)
• files/srv/guest-installer/etch/cdrom.supplement/isolinux/isolinux.cfg (added)

trunk/packages/sipb-xen-guest-installer/sipb-xen-guest-installer/debian/sipb-xen-guest-installer.postinst

@@ -6 +6 @@
 set -e
 set -x
-#set -n
 
 # summary of how this script can be called:
@@ -32 +31 @@
             rm -rf $d/cdrom; cp -a $d/cdrom.orig $d/cdrom
             patch -d $d/cdrom -p1 <$d/cdrom.patch
+            tar cf - -C $d/cdrom.supplement . | tar xf - -C $d/cdrom
         done
     ;;

trunk/packages/sipb-xen-guest-installer/sipb-xen-guest-installer/files/srv/guest-installer/etch/cdrom.patch

@@ -1 @@
-diff -Nur cdrom.old/isolinux/isolinux.cfg cdrom/isolinux/isolinux.cfg
---- cdrom.old/isolinux/isolinux.cfg 2007-08-20 16:16:20.000000000 -0400
-+++ cdrom/isolinux/isolinux.cfg 2007-10-16 01:04:37.000000000 -0400
-@@ -12,7 +12,11 @@
- F9 f9.txt
- F0 f10.txt
-
--DEFAULT install
-+DEFAULT sipb-xen-install
-+
-+LABEL sipb-xen-install
-+       kernel /install.amd/vmlinuz
-+       append auto=true preseed/file=/cdrom/preseed.cfg priority=critical vga=normal fb=false initrd=/install.amd/initrd.gz --
-
- LABEL install
-        kernel /install.amd/vmlinuz