Hello, please have a look at the attached patch and consider merging it. It's required to get live-installer to work.
There's also another patch for live-build that adds the missing bootloader menu entries to start debian-installer from the live image. Please consider including it as well. Thank you! Cheers, -- Raphaël Hertzog ◈ Debian Developer Get the Debian Administrator's Handbook: → http://debian-handbook.info/get/
>From a3409317bf83c52d19f9a082b7eba733d63d19e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[email protected]> Date: Wed, 5 Dec 2012 17:03:20 +0100 Subject: [PATCH] Preserve /etc/fstab created by d-i during the copy of the live system We obviously want the installed system to have the /etc/fstab that matches the setup that was defined in partman. Furthermore d-i relies on having a good /etc/fstab to mount the CDROM and install supplementary packages on the target system. --- debian/changelog | 6 ++++++ debian/live-installer.postinst | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index b1b8821..aa31606 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-installer (38) UNRELEASED; urgency=low + + * Preserve /etc/fstab created by d-i during the copy of the live system. + + -- Raphaël Hertzog <[email protected]> Wed, 05 Dec 2012 16:52:20 +0100 + live-installer (37) unstable; urgency=low [ Colin Watson ] diff --git a/debian/live-installer.postinst b/debian/live-installer.postinst index 800038b..3bf70a9 100644 --- a/debian/live-installer.postinst +++ b/debian/live-installer.postinst @@ -27,6 +27,12 @@ install_live_system () { . $script done + # Backup pre-existing /etc/fstab as it will be overwritten by the + # copy of the live system + if [ -e /target/etc/fstab ] && [ ! -e /target/etc/fstab.live-installer ]; then + mv /target/etc/fstab /target/etc/fstab.live-installer + fi + for place in $PLACES; do [ ! -e $place ] && continue @@ -64,6 +70,11 @@ install_live_system () { eval ${SUPPORT}_teardown done + # Restore the fstab file created by d-i + if [ -e /target/etc/fstab.live-installer ]; then + mv /target/etc/fstab.live-installer /target/etc/fstab + fi + if [ ${PLACE_FOUND} -eq 0 ]; then error "Could not find any live images" exit 1 -- 1.7.10.4
>From a35337501d7cb6ed636b3a67e38c7c93d50b2afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[email protected]> Date: Thu, 6 Dec 2012 10:50:25 +0100 Subject: [PATCH] Add the menu entries for the live Debian installer --- share/bootloaders/extlinux/install.cfg | 10 +++++++++- share/bootloaders/isolinux/install.cfg | 10 +++++++++- share/bootloaders/pxelinux/install.cfg | 10 +++++++++- share/bootloaders/syslinux/install.cfg | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/share/bootloaders/extlinux/install.cfg b/share/bootloaders/extlinux/install.cfg index 94fb816..b96e208 100644 --- a/share/bootloaders/extlinux/install.cfg +++ b/share/bootloaders/extlinux/install.cfg @@ -1 +1,9 @@ -# FIXME +label installgui + menu label ^Graphical install + kernel /install/gtk/vmlinuz + append video=vesa:ywrap,mtrr vga=788 initrd=/install/gtk/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet + +label install + menu label ^Text-mode install + kernel /install/vmlinuz + append vga=788 initrd=/install/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet diff --git a/share/bootloaders/isolinux/install.cfg b/share/bootloaders/isolinux/install.cfg index 94fb816..b96e208 100644 --- a/share/bootloaders/isolinux/install.cfg +++ b/share/bootloaders/isolinux/install.cfg @@ -1 +1,9 @@ -# FIXME +label installgui + menu label ^Graphical install + kernel /install/gtk/vmlinuz + append video=vesa:ywrap,mtrr vga=788 initrd=/install/gtk/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet + +label install + menu label ^Text-mode install + kernel /install/vmlinuz + append vga=788 initrd=/install/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet diff --git a/share/bootloaders/pxelinux/install.cfg b/share/bootloaders/pxelinux/install.cfg index 94fb816..b96e208 100644 --- a/share/bootloaders/pxelinux/install.cfg +++ b/share/bootloaders/pxelinux/install.cfg @@ -1 +1,9 @@ -# FIXME +label installgui + menu label ^Graphical install + kernel /install/gtk/vmlinuz + append video=vesa:ywrap,mtrr vga=788 initrd=/install/gtk/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet + +label install + menu label ^Text-mode install + kernel /install/vmlinuz + append vga=788 initrd=/install/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet diff --git a/share/bootloaders/syslinux/install.cfg b/share/bootloaders/syslinux/install.cfg index 94fb816..b96e208 100644 --- a/share/bootloaders/syslinux/install.cfg +++ b/share/bootloaders/syslinux/install.cfg @@ -1 +1,9 @@ -# FIXME +label installgui + menu label ^Graphical install + kernel /install/gtk/vmlinuz + append video=vesa:ywrap,mtrr vga=788 initrd=/install/gtk/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet + +label install + menu label ^Text-mode install + kernel /install/vmlinuz + append vga=788 initrd=/install/initrd.gz @LB_BOOTAPPEND_INSTALL@ -- quiet -- 1.7.10.4
