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

into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/03/11 19:48:55+01:00 (none)!br1
nylon updates

BKrev: 4231fc13loxiimZ6UiyKsu8zAStRWg

2 files changed, 14 insertions, 1 deletions

diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index eb6e913e0e..c14f1c6ea4 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -28,10 +28,17 @@ else
 	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"
+		echo "adding flash-backup crontab"
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "0 * * * *    /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root
 	fi
+	 
+	if ! grep -q reset-wlan /etc/cron/crontabs/root; then
+		echo "adding reset-wlan crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
+		echo "0 3 * * *    /usr/sbin/reset-wlan" >> /etc/cron/crontabs/root
+	fi
+
 	update-rc.d -s busybox-cron defaults
 fi
 }
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index 1840f4fc53..90da9bf5b9 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -15,6 +15,7 @@ do_install() {
 	install -d ${D}${sbindir}
 	ln -s /var/tmp ${D}/srv/www/rrd-img
 	install -m 755 ${S}/*.html ${D}/srv/www/cgi-bin
+	ln -s /var/tmp/nav.inc.html ${D}/srv/www/cgi-bin
 	install -m 755 ${S}/collect.sh ${D}${sbindir}
 }
 
@@ -33,6 +34,11 @@ else
 		echo "A:*" > /etc/httpd.conf
 	fi	
 	update-rc.d -s busybox-httpd defaults
+	
+	if ! grep -q "/var/lib/rrd/" /etc/nylon/backup.list; then
+		echo "adding to backup list"
+		echo "/var/lib/rrd/" >> /etc/nylon/backup.list
+	fi
 fi
 }