[oe-commits] org.oe.dev slugos-init: Now loades IDE kernel modules for nas100d

[rwhitby commit]

slugos-init: Now loades IDE kernel modules for nas100d

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4782f0e3205e9a58989aa7961f0817534da68bf5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4782f0e3205e9a58989aa7961f0817534da68bf5
Files:
1
packages/slugos-init/files/initscripts/umountinitrd.sh
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r44f9aad57e18357050ae75c063e28db05f57d6ad -r4782f0e3205e9a58989aa7961f0817534da68bf5
#
# 
# 
# patch "packages/slugos-init/files/initscripts/umountinitrd.sh"
#  from [735c20eb565fb8e29558a692b2acacf19cee5dcc]
#    to [63383a0ed0e82ffa2a634b62e973d3428447629e]
# 
# patch "packages/slugos-init/files/modulefunctions"
#  from [b47474c9c89ad8c2f830e182d93f408b14a691bb]
#    to [4e84c37f984852463af7741ae6c83b5910f65d35]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [10c62411063be0d9b276f83bf13440ae8e974384]
#    to [55382995e38d7d350f6cdf734d685290af6b98eb]
# 
============================================================
--- packages/slugos-init/files/initscripts/umountinitrd.sh	735c20eb565fb8e29558a692b2acacf19cee5dcc
+++ packages/slugos-init/files/initscripts/umountinitrd.sh	63383a0ed0e82ffa2a634b62e973d3428447629e
@@ -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
============================================================
--- packages/slugos-init/files/modulefunctions	b47474c9c89ad8c2f830e182d93f408b14a691bb
+++ packages/slugos-init/files/modulefunctions	4e84c37f984852463af7741ae6c83b5910f65d35
@@ -13,6 +13,7 @@ loaddiskmods(){
 	        modprobe ohci-hcd
 		;;
             nas100d)
+                modprobe pata-artop
                 modprobe ehci-hcd
                 modprobe uhci-hcd
                 ;;
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	10c62411063be0d9b276f83bf13440ae8e974384
+++ packages/slugos-init/slugos-init_0.10.bb	55382995e38d7d350f6cdf734d685290af6b98eb
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r73"
+PR = "r74"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \