[maemo-commits] [maemo-commits] r16681 - in projects/haf/trunk/osso-af-startup: . debian top-scripts

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-11-17 09:26:28 +0200 (Mon, 17 Nov 2008)
New Revision: 16681

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postrm
   projects/haf/trunk/osso-af-startup/top-scripts/hwclock
Log:
  * Fix SI errors (hwclock::(restart|force-reload)), postrm::update-rc.d remove hwclock

Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-11-16 21:52:54 UTC (rev 16680)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-11-17 07:26:28 UTC (rev 16681)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.69)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.72)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-16 21:52:54 UTC (rev 16680)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-17 07:26:28 UTC (rev 16681)
@@ -1,6 +1,7 @@
 osso-af-startup (1.72-1) unstable; urgency=low
 
   * Don't unconditionally source /etc/osso-af-init/keyboard.sh
+  * Fix SI errors (hwclock::(restart|force-reload)), postrm::update-rc.d remove hwclock
 
  -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 12 Nov 2008 13:10:26 +0200
 

Modified: projects/haf/trunk/osso-af-startup/debian/postrm
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postrm	2008-11-16 21:52:54 UTC (rev 16680)
+++ projects/haf/trunk/osso-af-startup/debian/postrm	2008-11-17 07:26:28 UTC (rev 16681)
@@ -3,3 +3,4 @@
 update-rc.d -f af-services remove > /dev/null
 update-rc.d -f af-startup remove > /dev/null
 update-rc.d -f af-base-apps remove > /dev/null
+update-rc.d -f hwclock remove > /dev/null

Modified: projects/haf/trunk/osso-af-startup/top-scripts/hwclock
===================================================================
--- projects/haf/trunk/osso-af-startup/top-scripts/hwclock	2008-11-16 21:52:54 UTC (rev 16680)
+++ projects/haf/trunk/osso-af-startup/top-scripts/hwclock	2008-11-17 07:26:28 UTC (rev 16681)
@@ -14,31 +14,47 @@
 # Debian init.d script for hwclock
 # Copyright Nokia Corporation 2008
 
+start()
+{
+  if test -x "/sbin/hwclock"; then
+    echo -n 'Synching hardware clock to system time ... '
+    /sbin/hwclock -s
+    if test "x$?" = "x0"; then
+      echo "OK"
+    else
+      echo "FAILED"
+    fi
+  fi
+}
+
+stop()
+{
+  if test -x "/sbin/hwclock"; then
+    echo -n 'Synching system time to hardware clock ... '
+    /sbin/hwclock -w
+    if test "x$?" = "x0"; then
+      echo "OK"
+    else
+      echo "FAILED"
+    fi
+  fi
+}
+
 case "$1" in
   start)
-    if test -x "/sbin/hwclock"; then
-      echo -n 'Synching hardware clock to system time ... '
-      /sbin/hwclock -s
-      if test "x$?" = "x0"; then
-        echo "OK"
-      else
-        echo "FAILED"
-      fi
-    fi
+    start
   ;;
+  restart)
+  stop
+  start
+  ;;
+  force-reload)
+  ;;
   stop)
-    if test -x "/sbin/hwclock"; then
-      echo -n 'Synching system time to hardware clock ... '
-      /sbin/hwclock -w
-      if test "x$?" = "x0"; then
-        echo "OK"
-      else
-        echo "FAILED"
-      fi
-    fi
+    stop
   ;;
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop}" >&2
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2
     exit 2
   ;;
 esac