[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-16-gfefba74

[Daniel Baumann]

The branch, master has been updated
       via  fefba741836c83c195149763cbed1513a5310cba (commit)
      from  20c3c938a0d2f6749135988d589a639199a7846d (commit)


- Shortlog ------------------------------------------------------------
fefba74 Don't fail if resolv.conf is a symlink, thanks to David Madore <david.madore at ens.fr> (Closes: #457595).

Summary of changes:
 helpers/lh_chroot_resolv |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit fefba741836c83c195149763cbed1513a5310cba
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Dec 23 21:26:01 2007 +0100

    Don't fail if resolv.conf is a symlink, thanks to David Madore <david.madore at ens.fr> (Closes: #457595).

diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index bc53c68..36a1a1b 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -49,9 +49,9 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/etc/resolv.conf ]
+		if [ -e chroot/etc/resolv.conf ]
 		then
-			# Save resolv file
+			# Save resolv file or symlink
 			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
 		fi
 
@@ -74,9 +74,9 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/etc/resolv.conf.orig ]
+		if [ -e chroot/etc/resolv.conf.orig ]
 		then
-			# Restoring resolv file
+			# Restoring resolv file or symlink
 			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
 		else
 			# Truncating resolv file

-- 
debian-live/live-helper