[Debian-live-changes] r2580 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Thu Jul 26 17:58:50 UTC 2007
Author: daniel
Date: 2007-07-26 17:58:49 +0000 (Thu, 26 Jul 2007)
New Revision: 2580
Modified:
dists/trunk/live-helper/helpers/lh_chroot_hacks
dists/trunk/live-helper/helpers/lh_chroot_resolv
Log:
Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-07-26 09:01:51 UTC (rev 2579)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-07-26 17:58:49 UTC (rev 2580)
@@ -89,9 +89,6 @@
# Remove generated xorg.conf based on build systems configuration
rm -f chroot/etc/X11/xorg.conf
-# Touch resolv.conf
-touch chroot/etc/resolv.conf
-
# Remove cruft
rm -f chroot/boot/initrd*bak*
rm -f /etc/apt/trusted.gpg~
Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-07-26 09:01:51 UTC (rev 2579)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-07-26 17:58:49 UTC (rev 2580)
@@ -75,11 +75,11 @@
if [ -f chroot/etc/resolv.conf.orig ]
then
- # Restore resolv file
+ # Restoring resolv file
mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
else
- # Remove resolv file
- rm -f chroot/etc/resolv.conf
+ # Truncating resolv file
+ cat < /dev/null > chroot/etc/resolv.conf
fi
# Removing stage file
More information about the Debian-live-changes
mailing list