From 672c5ccad674d0cc907d19e283287114a38ba9e8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 23 Jul 2012 21:34:28 +0100 Subject: [PATCH] Import patches-unapplied version 2.72 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: fca5765e72b11890a1f338db133589eef8cbb065 New changelog entries: * Install a hook to remove /etc/fstab rather than building ubuntu-server with --debian-installer=live; the latter has unwanted side-effects. --- debian/changelog | 7 +++++++ live-build/auto/config | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 404a32bb..9c871935 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.72) quantal; urgency=low + + * Install a hook to remove /etc/fstab rather than building ubuntu-server + with --debian-installer=live; the latter has unwanted side-effects. + + -- Colin Watson Mon, 23 Jul 2012 21:34:28 +0100 + livecd-rootfs (2.71) quantal; urgency=low * live-build/auto/config: Don't purge .pyc files on ubuntu-server images. diff --git a/live-build/auto/config b/live-build/auto/config index 7922bb13..eeb244b8 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -199,7 +199,6 @@ case $PROJECT in add_task install minimal standard server COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' - OPTS="${OPTS:+$OPTS }--debian-installer=live" ;; ubuntu-core) @@ -293,6 +292,13 @@ case $PROJECT in kubuntu|kubuntu-active) ln -s /usr/share/live/build/examples/hooks/kubuntu_chroot_icon-theme.sh config/chroot_local-hooks/ ;; + + ubuntu-server) + cat > config/chroot_local-hooks/ubuntu-server_chroot_remove-fstab.sh <