From 17bc13e2334e0563810599b53982f745e86c3a34 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 12 Jul 2006 04:03:47 +0000 Subject: unslung-rootfs: rc.sysinit - empty win_share file on boot --- packages/nslu2-binary-only/unslung-rootfs/NOTES | 7 +++++++ .../unslung-rootfs/rc.sysinit-win_share.patch | 15 +++++++++++++++ packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index d6d789a858..de4d8b00bf 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -539,3 +539,10 @@ Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command Added network console debugging support: - patched netconsole driver, added netconsole kernel module to image - updated /linuxrc (& misc files) for basic support of same + +Added ".nodisk" flag -- presence of the ".nodisk" file on the flash root +will force a one-time-only boot to flash. This makes for easier testing and +maintenance; easier than plugging and unplugging disks. + +Empty the /etc/win_share.info file on boot (fixes problem with multiple +identical shares appearing on a system). diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch new file mode 100644 index 0000000000..392a294588 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch @@ -0,0 +1,15 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-07-11 01:36:28.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-07-11 10:10:29.000000000 -0500 +@@ -43,6 +43,12 @@ + > /var/log/wtmp + fi + ++# Clean up /etc/win_share.info (fixes bug where shares appear ++# multiple times. Do not create the file if it doesn't exist, though. ++if ( [ -f /etc/win_share.info ] ) ; then ++ > /etc/win_share.info ++fi ++ + /bin/echo "Starting Hostname :"; hostname ${HOSTNAME}; check_status + #/bin/echo "Starting System Log :"; . /etc/rc.d/rc.syslogd + /bin/echo "Starting Modules :"; . /etc/rc.d/rc.modules diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index c9ec1fbdde..73089bafeb 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r14" +PR = "r15" DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" @@ -46,6 +46,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://security-fixes.patch;patch=1 \ file://rc.sysinit-clean_var.patch;patch=1 \ file://rc.sysinit-cpbug.patch;patch=1 \ + file://rc.sysinit-win_share.patch;patch=1 \ file://rc.modules-nls.patch;patch=1 \ file://telnet-passwd.patch;patch=1 \ file://upgrade.htm \ -- cgit 1.2.3-korg