[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a3-1-8-g3d0c25d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3d0c25d811720e4793aa8b37e31e0f2a89fe8128
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 17 11:04:53 2012 +0200

    Correcting /etc/default/hwclock handling in util-linux script for cases where it was locally removed.

diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
index 225606f..7f56753 100755
--- a/scripts/debconfig/0040-util-linux
+++ b/scripts/debconfig/0040-util-linux
@@ -67,16 +67,19 @@ case "${_HWCLOCKACCESS}" in
 		;;
 esac
 
-# HWCLOCKACCESS is commented in /etc/default/hwclock
-if [ -z "${HWCLOCKACCESS}" ]
+if [ -e /etc/default/hwclock ]
 then
-	# uncommenting it
-	sed -e "s|^# *HWCLOCKACCESS=|HWCLOCKACCESS=|" \
-		/etc/default/hwclock > /etc/default/hwclock.tmp
-
-	mv /etc/default/hwclock.tmp /etc/default/hwclock
+	# HWCLOCKACCESS is commented in /etc/default/hwclock
+	if [ -z "${HWCLOCKACCESS}" ]
+	then
+		# uncommenting it
+		sed -e "s|^# *HWCLOCKACCESS=|HWCLOCKACCESS=|" \
+			/etc/default/hwclock > /etc/default/hwclock.tmp
+	else
+		cp /etc/default/hwclock /etc/default/hwclock.tmp
+	fi
 else
-	cp /etc/default/hwclock /etc/default/hwclock.tmp
+	touch /etc/default/hwclock.tmp
 fi
 
 # Set the hwclock parameters

-- 
live-debconfig