Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/05 14:27:25+01:00 (none)!br1
nylon-statistics

2005/01/05 14:20:50+01:00 (none)!br1
improved postinst for nylon-scripts, nylon-statistics, ntp (nylon) and prism2-firmware-update

BKrev: 41dbee37nRSzsrYX2DJsbnG6pcc5bQ

2 files changed, 18 insertions, 13 deletions

diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 923ae89d45..eb6e913e0e 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -15,19 +15,21 @@ do_install() {
 }
 
 pkg_postinst() {
-#!/bin/sh
-update-rc.d hostap defaults 14
-update-rc.d bridge defaults 15
-update-rc.d ipaliases defaults 16
-update-rc.d firewall defaults 20
-update-rc.d routing defaults 20
-update-rc.d emergency-ip defaults 98
-update-rc.d flash-backup start 38 S . stop 38 0 6 .
-update-rc.d dummydate start 50 S . stop 50 0 6 .
-if test "x$D" == "x"; then
-	mkdir -p /etc/cron/crontabs
+if test "x$D" != "x"; then
+	exit 1
+else
+	update-rc.d -s hostap defaults 14
+	update-rc.d -s bridge defaults 15
+	update-rc.d -s ipaliases defaults 16
+	update-rc.d -s firewall defaults 20
+	update-rc.d -s routing defaults 20
+	update-rc.d -s emergency-ip defaults 98
+	update-rc.d -s flash-backup start 38 S . stop 38 0 6 .
+	update-rc.d -s dummydate start 50 S . stop 50 0 6 .
+	
 	if ! grep -q flash-backup /etc/cron/crontabs/root; then
 		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "0 * * * *    /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index aef674b6b2..060e6182d0 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -18,13 +18,16 @@ do_install() {
 }
 
 pkg_postinst() {
-if test "x$D" == "x"; then
-	mkdir -p /etc/cron/crontabs
+if test "x$D" != "x"; then
+	exit 1
+else
 	if ! grep -q collect.sh /etc/cron/crontabs/root; then
 		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "*/5 * * * *    /usr/sbin/collect.sh" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
+	/etc/init.d/busybox-cron reload
 	if [ ! -e /etc/httpd.conf ]; then
 		echo "A:*" > /etc/httpd.conf
 	fi