[SCM] live-boot branch, debian-next, updated. debian/3.0_a16-1-7-g483ffee
Daniel Baumann
daniel at debian.org
Wed May 18 17:32:36 UTC 2011
The following commit has been merged in the debian-next branch:
commit 822bdbf4f203761cfc76cb720ff55350688c39d4
Author: Michal Suchanek <hramrach at centrum.cz>
Date: Tue May 17 18:40:01 2011 +0200
Copy resolv.conf to live system root (Closes: #627178).
diff --git a/scripts/live b/scripts/live
index 2afbb69..76be7ae 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1942,6 +1942,13 @@ mountroot ()
log_end_msg
fi
+ if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+ then
+ log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+ cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+ log_end_msg
+ fi
+
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
--
live-boot
More information about the debian-live-changes
mailing list