summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2006-03-02 03:47:06 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-02 03:47:06 +0000
commitbe47f7db1b1b5cdebbe597bc6ba39d54f62add81 (patch)
treeea56bc164cdc2ad2efa66546f18dc8a40edf089d /packages
parentd22b7761d665052ffaee6a5b8194683e45e2c43e (diff)
unslung-rootfs: rc.sysinit fix - clean .pid files in /var/run
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/nslu2-binary-only/unslung-rootfs-2.3r63/ipkg-fl2
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.sysinit-clean_var.patch22
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb3
3 files changed, 25 insertions, 2 deletions
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/ipkg-fl b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/ipkg-fl
index 514ccd4ec8..ade959a759 100755
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/ipkg-fl
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/ipkg-fl
@@ -2,7 +2,7 @@
echo
echo "Error: The ipkg command cannot currently be used because this"
echo "system is running from its internal flash; it is not currently"
-echo "\"uNSLUng\" to an external disk or flash device."
+echo "\"unslung\" to an external disk or flash device."
echo
echo "Please complete the process of \"unslinging\" this system, or"
echo "resolve the issues that did not permit it to boot from the"
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.sysinit-clean_var.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.sysinit-clean_var.patch
new file mode 100644
index 0000000000..17e7ebef43
--- /dev/null
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.sysinit-clean_var.patch
@@ -0,0 +1,22 @@
+--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-03-01 17:55:20.000000000 -0600
++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-03-01 18:25:06.000000000 -0600
+@@ -30,6 +30,19 @@
+ mkdir -p /var/log/samba >/dev/null
+ touch /var/log/server.log >/dev/null
+ chmod 755 /var/log/samba >/dev/null
++
++# Clean up /var/lock and /var/run (fixes bug where USB_Detect fails),
++# and empty utmp and wtmp (but do not create them if they don't exist).
++rm -f /var/run/*.pid
++rm -f /var/lock/samba/*.pid
++rm -f /var/lock/ds_diag
++if ( [ -f /var/run/utmp ] ) ; then
++ > /var/run/utmp
++fi
++if ( [ -f /var/log/wtmp ] ) ; then
++ > /var/log/wtmp
++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 e572411583..910ad102a9 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 = "r10"
+PR = "r11"
DEPENDS = "nslu2-linksys-libs"
@@ -42,6 +42,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
file://wait-for-quotacheck.patch;patch=1 \
file://mount_usbdevfs.patch;patch=1 \
file://security-fixes.patch;patch=1 \
+ file://rc.sysinit-clean_var.patch;patch=1 \
file://upgrade.htm \
file://upgrade.cgi \
file://telnet.htm \