Horrible hacky, maybe working, work round for shutdown -r. Please report

any future hangs on shutdown -r in slugbug 145.

diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index 8ab9379708ef3d8cccd8dbfde6d316349fc05928..afd0ec8321f06418a14b5140cf9d1cb59ace5b33 100644 (file)
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r1"
+PR = "r2"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include

diff --git a/packages/linux/nslu2-kernel_2.6.12.bb b/packages/linux/nslu2-kernel_2.6.12.bb
index e3e536fe3e3e0a628dbc66765809e00ccebfb30c..8ab9379708ef3d8cccd8dbfde6d316349fc05928 100644 (file)
--- a/packages/linux/nslu2-kernel_2.6.12.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r0"
+PR = "r1"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include

diff --git a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch
index 3995ba691e2e2b78065f49ac5b2eceeb90f2039f..4e68456e20d5d498c01b0c6abd06e42a988b8211 100644 (file)
--- a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch
+++ b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch
@@ -102,7 +102,7 @@
 +      ldr     r7, =IXP4XX_TIMER_BASE_VIRT
 +      ldr     r8, =IXP4XX_WDT_KEY             @ set key
 +      str     r8, [r7, #IXP4XX_OSWK_OFFSET]
-+      mov     r8, #0x10000000                 @ about 4 seconds
++      mov     r8, #0x1000000                  @ about 0.25 seconds
 +      str     r8, [r7, #IXP4XX_OSWT_OFFSET]   @ set timer
 +      mov     r8, #(IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE)
 +      str     r8, [r7, #IXP4XX_OSWE_OFFSET]   @ enable reset

diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb
index c4408ae4791306321b35294cf6bbdb8b0689bf3a..1fe7da7344b09e5f13d2bb43f349d513f234effc 100644 (file)
--- a/packages/linux/openslug-kernel_2.6.11.2.bb
+++ b/packages/linux/openslug-kernel_2.6.11.2.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-PR = "r13"
+PR = "r14"
 
 KERNEL_SUFFIX = "openslug"
 

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh
index b7ae8b76e5a41868bc574f664f9bd9e93f3ba3c6..da39b425f8ff79ddbc05bb5240ee006a6e57fcd7 100644 (file)
--- a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh
+++ b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh
@@ -1,5 +1,18 @@
 #!/bin/sh
 #
 # umount /mnt, which is where the initrd ends up mounted
-# if the directory /initrd is not present
-exec umount /mnt 2>/dev/null
+# if the directory /initrd is not present, if this fails
+# then the /initrd is mounted and we want to remount that
+# ro - this works round the shutdown -r hang problem
+umount /mnt 2>/dev/null || {
+       # need the device for a remount
+       . /etc/default/functions
+       ffspart=Flashdisk
+       ffsdev="$(mtblockdev $ffspart)"
+       if test -n "$ffsdev" -a -b "$ffsdev"
+       then
+               mount -o remount,ro "$ffsdev" /initrd
+       else
+               echo "Flashdisk: $ffsdev: flash device not found" >&2
+       fi
+}

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 537760f8d577d491019345922c236aa17c9ca609..59b8c0fd5dd18431c46f4d6002d281cb1225d6ef 100644 (file)
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r37"
+PR = "r38"
 
 SRC_URI = "file://linuxrc \
           file://boot/flash \