From 42a20948ac4137744ec13ca1a2d2bebb590315b0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Oct 2009 13:43:05 +0100 Subject: [PATCH] Merging casper 1.168. --- docs/ChangeLog.casper | 10 ++++++++++ scripts/live | 4 ++-- scripts/live-bottom/43disable_updateinitramfs | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 6f1b59b..59e09ef 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,13 @@ +casper (1.168) jaunty; urgency=low + + * Fix writing of "$@" to diverted update-initramfs script (here-documents + perform parameter expansion unless the delimiter is quoted). + * Don't bring up a temporary network interface while fetching the preseed + file when netbooting, as that will disconnect our root filesystem + (LP: #351982). + + -- Colin Watson Tue, 31 Mar 2009 15:39:29 +0100 + casper (1.167) jaunty; urgency=low * Disable kwallet from KDE 4 in 34disable_kde_services diff --git a/scripts/live b/scripts/live index 9bbf8be..2753d5e 100755 --- a/scripts/live +++ b/scripts/live @@ -390,9 +390,9 @@ Arguments () mount -o bind /dev /root/dev mkdir -p /root/var/run/network - chroot /root dhclient eth0 + [ "${NETBOOT}" ] || chroot /root dhclient eth0 chroot /root wget -P /tmp "${location}" - chroot /root ifconfig eth0 down + [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down umount /root/sys umount /root/proc diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs index dab2290..fa0ecac 100755 --- a/scripts/live-bottom/43disable_updateinitramfs +++ b/scripts/live-bottom/43disable_updateinitramfs @@ -33,7 +33,7 @@ chroot /root dpkg-divert --add --rename --quiet \ if [ -w /cdrom ] then -cat > /root/usr/sbin/update-initramfs << EOF +cat > /root/usr/sbin/update-initramfs << 'EOF' #!/bin/sh update-initramfs.distrib "$@" -- 2.1.4