packages: tzdata/timezone.init - cosmetics

glen glen at pld-linux.org
Mon Aug 24 23:27:55 CEST 2009


Author: glen                         Date: Mon Aug 24 21:27:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
packages/tzdata:
   timezone.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/tzdata/timezone.init
diff -u packages/tzdata/timezone.init:1.14 packages/tzdata/timezone.init:1.15
--- packages/tzdata/timezone.init:1.14	Thu Apr 24 19:08:47 2008
+++ packages/tzdata/timezone.init	Mon Aug 24 23:27:49 2009
@@ -25,19 +25,21 @@
 [ -L /etc/localtime ] && [ "$(resolvesymlink /etc/localtime)" = "$ZONE_FILE" ] && exit 0
 
 start() {
-	if [ ! -f /var/lock/subsys/timezone ]; then
-		if [ -f "$ZONE_FILE" ]; then
-			rm -f /etc/localtime
+	if [ -f /var/lock/subsys/timezone ]; then
+		return
+	fi
 
-			MESSAGE=$(nls 'Setting time zone information (%s)' "$TIMEZONE")
+	if [ -f "$ZONE_FILE" ]; then
+		rm -f /etc/localtime
 
-			run_cmd "$MESSAGE" cp -af $ZONE_FILE /etc/localtime
-			RETVAL=$?
-			restorecon /etc/localtime >/dev/null 2>&1
-		fi
+		MESSAGE=$(nls 'Setting time zone information (%s)' "$TIMEZONE")
 
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/timezone
+		run_cmd "$MESSAGE" cp -af $ZONE_FILE /etc/localtime
+		RETVAL=$?
+		restorecon /etc/localtime >/dev/null 2>&1
 	fi
+
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/timezone
 }
 
 stop() {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/timezone.init?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list