generic: add openntpd to generic, configure it properly

All images should have proper time set..  Also configure
openntpd properly, as it should've been running w/ -s.

Signed-off-by: Andres Salomon <dilinger@queued.net>

diff --git a/configs/debxo-awesome/packages b/configs/debxo-awesome/packages
index 8ffa2c751d119dbcf7599111ba327d75e14ffbe9..205cc7d40e6c06f43a21cdf0a818a03f329628b1 100644 (file)
--- a/configs/debxo-awesome/packages
+++ b/configs/debxo-awesome/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/debxo-gnome/packages b/configs/debxo-gnome/packages
index a1845df10e282eaef0602230549e37f2489dc09a..d079eb517433bfd542a7a361639f1f6fcebe05c0 100644 (file)
--- a/configs/debxo-gnome/packages
+++ b/configs/debxo-gnome/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/debxo-kde/packages b/configs/debxo-kde/packages
index ef30785b05719ca9a4346faa6869518b353a924e..c17b96a4ffb5a48379581adcec704348b2fe287a 100644 (file)
--- a/configs/debxo-kde/packages
+++ b/configs/debxo-kde/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/debxo-lxde/packages b/configs/debxo-lxde/packages
index c907d7b153642f0e04f7374f23f068032d92ba91..3b9b5df67e0559642331b45c7f4105465bdf8ec6 100644 (file)
--- a/configs/debxo-lxde/packages
+++ b/configs/debxo-lxde/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/debxo-sugar/packages b/configs/debxo-sugar/packages
index 210ee7289c18e63a2deaf2ffd995d707f06ba199..855990cc197bf7732ebbc8ff3e213e849f522653 100644 (file)
--- a/configs/debxo-sugar/packages
+++ b/configs/debxo-sugar/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/debxo-xfce/packages b/configs/debxo-xfce/packages
index cad323452a1d85ad73964760e5609741ace5f521..cd2c94a3ed80b7aba9ba8e959d18539f6fc0d2eb 100644 (file)
--- a/configs/debxo-xfce/packages
+++ b/configs/debxo-xfce/packages
@@ -11,7 +11,6 @@ initramfs-tools/lenny-backports
 wireless-tools
 alsa-utils
 console-tools
-openntpd
 
 # the silly i-always-use-this-shit stuff
 less

diff --git a/configs/generic/hooks b/configs/generic/hooks
index 2f9a3f4b24e409fb54ec1d98cf3cb3bb4dabeacc..ed7aec1a259b64acfd1581645dffddad0ec740cc 100644 (file)
--- a/configs/generic/hooks
+++ b/configs/generic/hooks
@@ -17,6 +17,13 @@ package_configure_hook()
        # Any customizations that need to be made after all packages have been
        # installed should be put here.  $ROOT_DIR should be prefixed to any
        # paths.
+
+        # configure openntpd (to run w/ -s by default)
+        F=${ROOT_DIR}/etc/default/openntpd
+        if [ -f ${F} ]; then
+                sed --in-place "s/^.*DAEMON_OPTS=/DAEMON_OPTS=/" ${F}
+        fi
+
 }
 
 cleanup_chroot_hook()

diff --git a/configs/generic/packages b/configs/generic/packages
index 77fde095ba70e0d7d395be0ebb9f6b66126aed46..d6ee392ffb2f0d92965ff1ad2f4808c1e3d5e55d 100644 (file)
--- a/configs/generic/packages
+++ b/configs/generic/packages
@@ -9,3 +9,4 @@
 locales
 busybox
 sudo
+openntpd