diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-26 00:42:23 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-26 00:42:23 +0000 |
| commit | 5867852a8e90a31151acdd555a313ce660d4573c (patch) | |
| tree | 0564255a65f8e6b6ab1bbd5c58c85a686da22345 /packages/initrdscripts | |
| parent | 6e03f54929969450bcc876200c6aabcb7123cbe3 (diff) | |
| parent | 697b9b92a5931ad9042a282ccc0297c595d46644 (diff) | |
merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
and 'dafddd1d044d96ecf2e968c17c56e4f9f332240d'
Diffstat (limited to 'packages/initrdscripts')
4 files changed, 8 insertions, 6 deletions
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 1bb53d20a3..319f85aa6e 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -94,7 +94,7 @@ while read maj min nblk dev; do add_menu_item "$dev ($fstype)" done < /proc/partitions -add_menu_item "NFS (nfsroot=192.168.2.200:/nfs/image)" +add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)" total=`echo -e $list | wc -l` num=0 @@ -145,7 +145,7 @@ path=`expr "$sel" : '[^/]*\([^ ]*\).*'` if [ "$dev" == "NFS" ]; then ROOT_DEVICE="/dev/nfs" - CMDLINE="$CMDLINE nfsroot=192.168.2.200:/nfs/image" + CMDLINE="$CMDLINE nfsroot=192.168.2.200:/srv/nfs/oe/image" elif [ -n "$path" ]; then ROOT_DEVICE="/dev/loop" CMDLINE="looproot=/dev/$dev:$path" diff --git a/packages/initrdscripts/files/80-nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh index 5129a53ebb..e1588c16a8 100644 --- a/packages/initrdscripts/files/80-nfsboot.sh +++ b/packages/initrdscripts/files/80-nfsboot.sh @@ -31,10 +31,12 @@ if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then usb*) echo "USB" modprobe g_ether + sleep 5 ;; esac ifconfig $device $client_ip + ping -c 2 $server_ip ) echo "booting from NFS: $nfsroot" diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index e90247c522..19e7403b83 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,7 +1,7 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r4" +PR = "r7" DESCRIPTION = "An initramfs module with UI for selection of boot device." -RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" +RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1" diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index acf71adb92..77c38799f3 100644 --- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-nfsboot.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" @@ -10,4 +10,4 @@ do_install() { } PACKAGE_ARCH = "all" -FILES_${PN} += " /initrd.d/nfs " +FILES_${PN} += " /initrd.d/* " |