summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19-rc6.bb2
-rw-r--r--packages/slugos-init/files/initscripts/umountinitrd.sh13
-rw-r--r--packages/slugos-init/files/modulefunctions1
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
4 files changed, 13 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
index 83d77472ab..7620aedb0c 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "589"
+IXP4XX_KERNEL_SVN_REV = "591"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/slugos-init/files/initscripts/umountinitrd.sh b/packages/slugos-init/files/initscripts/umountinitrd.sh
index 9cb1f7a25d..2798fe5985 100644
--- a/packages/slugos-init/files/initscripts/umountinitrd.sh
+++ b/packages/slugos-init/files/initscripts/umountinitrd.sh
@@ -5,20 +5,27 @@
# then the /initrd is mounted and we want to remount that
# ro - this works round the shutdown -r hang problem
. /etc/default/functions
+
+case "$(machine)" in
+nslu2)
+ ffspart="Flashdisk";;
+*)
+ ffspart="filesystem";;
+esac
+
while read device directory remainder
do
case "$directory" in
/mnt) echo "InitRD: unmount initrd on /mnt" >&2
umount /mnt;;
/initrd)# need the device for a remount
- ffspart=Flashdisk
ffsdev="$(mtblockdev $ffspart)"
- echo "InitRD: remount $ffdev read-only on /initrd" >&2
+ echo "Remounting $ffsdev read-only on /initrd" >&2
if test -n "$ffsdev" -a -b "$ffsdev"
then
mount -o remount,ro "$ffsdev" /initrd
else
- echo "Flashdisk: $ffsdev: flash device not found" >&2
+ echo "$ffspart: $ffsdev: flash device not found" >&2
fi;;
esac
done </proc/mounts
diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions
index d7c2b9777c..1073dae4fb 100644
--- a/packages/slugos-init/files/modulefunctions
+++ b/packages/slugos-init/files/modulefunctions
@@ -13,6 +13,7 @@ loaddiskmods(){
modprobe ohci-hcd
;;
nas100d)
+ modprobe pata-artop
modprobe ehci-hcd
modprobe uhci-hcd
;;
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index de3b6151c1..54c1993c67 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r73"
+PR = "r74"
SRC_URI = "file://boot/flash \
file://boot/disk \