summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-25 18:18:32 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-25 18:18:32 +0000
commit53d7efa6b73e39162f028cad3ce27f3265d226c0 (patch)
tree53d0868df0e1f568f56f1e70d5ecba14f71618d7 /packages
parentad4884607bc29ec799316df7179368e78cce747c (diff)
parentf274a408a2bda158f637bd1b3fa4e0068fb87ed8 (diff)
merge of '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
and 'a2db4317a6940d3a7ea74bc07545523686942a59'
Diffstat (limited to 'packages')
-rw-r--r--packages/initrdscripts/files/30-bootmenu.sh4
-rw-r--r--packages/initrdscripts/initramfs-module-bootmenu_1.0.bb2
2 files changed, 3 insertions, 3 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/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index e90247c522..e768954434 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://30-bootmenu.sh"
-PR = "r4"
+PR = "r5"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
# For VFAT mounting.