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.

svn path=/trunk/packages/sipb-xen-guest-installer/sipb-xen-guest-installer/; revision=222

diff --git a/debian/sipb-xen-guest-installer.postinst b/debian/sipb-xen-guest-installer.postinst
index 8b81a90..7f2af3e 100755 (executable)
--- a/debian/sipb-xen-guest-installer.postinst
+++ b/debian/sipb-xen-guest-installer.postinst
@@ -5,7 +5,6 @@
 
 set -e
 set -x
 
 set -e
 set -x

-#set -n

 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>

@@ -31,6 +30,7 @@ case "$1" in
            umount $MOUNTDIR; rmdir $MOUNTDIR
            rm -rf $d/cdrom; cp -a $d/cdrom.orig $d/cdrom
            patch -d $d/cdrom -p1 <$d/cdrom.patch
            umount $MOUNTDIR; rmdir $MOUNTDIR
            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
     ;;
 
        done
     ;;
 

diff --git a/files/srv/guest-installer/etch/cdrom.patch b/files/srv/guest-installer/etch/cdrom.patch
index a741347..e69de29 100644 (file)
--- a/files/srv/guest-installer/etch/cdrom.patch
+++ b/files/srv/guest-installer/etch/cdrom.patch
@@ -1,16 +0,0 @@
-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

diff --git a/files/srv/guest-installer/etch/cdrom.supplement/isolinux/isolinux.cfg b/files/srv/guest-installer/etch/cdrom.supplement/isolinux/isolinux.cfg
new file mode 100644 (file)
index 0000000..b8c2935
--- /dev/null
+++ b/files/srv/guest-installer/etch/cdrom.supplement/isolinux/isolinux.cfg
@@ -0,0 +1,6 @@
+PROMPT 1
+TIMEOUT 0
+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 --