diffstat for live-build-4.0~alpha30 live-build-4.0~alpha30 changelog | 23 +++++++++++++++++++++++ patches/02_win32-loader-path.patch | 11 +++++++++++ patches/03_fix-resolvconf-truncate.patch | 28 ++++++++++++++++++++++++++++ patches/series | 2 ++ 4 files changed, 64 insertions(+) diff -Nru live-build-4.0~alpha30/debian/changelog live-build-4.0~alpha30/debian/changelog --- live-build-4.0~alpha30/debian/changelog 2013-11-04 18:10:30.000000000 +0000 +++ live-build-4.0~alpha30/debian/changelog 2014-02-16 21:08:17.000000000 +0000 @@ -1,3 +1,26 @@ +live-build (4.0~alpha30-1tanglu3) staging; urgency=medium + + * Drop 01_installer-fix-resolv.patch as it's broken and not needed with + build-with-chroot set to true + + -- Philip Muškovac Sun, 16 Feb 2014 22:07:47 +0100 + +live-build (4.0~alpha30-1tanglu2) staging; urgency=medium + + * Add 03_fix-resolvconf-truncate.patch so the host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the host + resolv.conf + + -- Philip Muškovac Sat, 15 Feb 2014 00:49:34 +0100 + +live-build (4.0~alpha30-1tanglu1) staging; urgency=low + + * Fix resolv.conf when running the installer script + * Search for win32-loader in the right location (when not + performing a chroot build) + + -- Matthias Klumpp Wed, 04 Dec 2013 20:53:39 +0100 + live-build (4.0~alpha30-1) experimental; urgency=low * Updating filenames suffixes of example hook files. diff -Nru live-build-4.0~alpha30/debian/patches/02_win32-loader-path.patch live-build-4.0~alpha30/debian/patches/02_win32-loader-path.patch --- live-build-4.0~alpha30/debian/patches/02_win32-loader-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha30/debian/patches/02_win32-loader-path.patch 2013-12-04 18:45:44.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/binary_win32-loader ++++ b/scripts/build/binary_win32-loader +@@ -59,7 +59,7 @@ + # Copying win32-loader + cp -r chroot/usr/share/win32/* binary + else +- cp -r usr/share/win32/* binary ++ cp -r /usr/share/win32/* binary + fi + + mv binary/win32-loader.exe binary/setup.exe diff -Nru live-build-4.0~alpha30/debian/patches/03_fix-resolvconf-truncate.patch live-build-4.0~alpha30/debian/patches/03_fix-resolvconf-truncate.patch --- live-build-4.0~alpha30/debian/patches/03_fix-resolvconf-truncate.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha30/debian/patches/03_fix-resolvconf-truncate.patch 2014-02-14 23:48:16.000000000 +0000 @@ -0,0 +1,28 @@ +Index: b/scripts/build/chroot_resolv +=================================================================== +--- a/scripts/build/chroot_resolv ++++ b/scripts/build/chroot_resolv +@@ -40,7 +40,11 @@ case "${1}" in + # Creating lock file + Create_lockfile .lock + +- if [ -e chroot/etc/resolv.conf ] ++ if [ -L chroot/etc/resolv.conf ] ++ then ++ # Move resolv.conf aside if it's a symlink (likely resolvconf) ++ mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig ++ elif [ -e chroot/etc/resolv.conf ] + then + # Save resolv file or symlink + mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig +@@ -51,10 +55,6 @@ case "${1}" in + # If you want to have a custom resolv.conf, please + # overwrite it with normal local_includes mechanism. + Truncate chroot/etc/resolv.conf.orig +- elif [ -L chroot/etc/resolv.conf ] +- then +- # Move resolv.conf aside if it's a symlink (likely resolvconf) +- mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig + fi + + if [ -f /etc/resolv.conf ] diff -Nru live-build-4.0~alpha30/debian/patches/series live-build-4.0~alpha30/debian/patches/series --- live-build-4.0~alpha30/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha30/debian/patches/series 2014-02-16 21:07:31.000000000 +0000 @@ -0,0 +1,2 @@ +02_win32-loader-path.patch +03_fix-resolvconf-truncate.patch