diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-24 12:14:59 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-24 12:14:59 +0000 |
| commit | e25f7b921088be5bf785372d4b76dad40f74baa7 (patch) | |
| tree | f7d4b73dcce10307542c6ec7ec124942dbeaf807 | |
| parent | ab3c6b224773dc828db4d4d354bcb8395d04c719 (diff) | |
initramfs-module-bootmenu: Switch from using buggy mount --guess-fstype to buggy klibc's fstype.
| -rw-r--r-- | packages/initrdscripts/files/30-bootmenu.sh | 8 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 5b3e7782f4..1bb53d20a3 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -1,3 +1,7 @@ +# +# (c) 2007 Paul Sokolovsky +# + # If root is explicitly specified, skip interactive selection if [ -z "$ROOT_DEVICE" ]; then ############################## @@ -52,7 +56,9 @@ get_menu_selection() get_partition_type() { - fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` +# fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` + fstype=`fstype </dev/$dev` + fstype=`expr "$fstype" : 'FSTYPE=\([A-Za-z0-9]*\).*'` } scan_for_loopimgs() diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 3fc8647f6c..002acff0a9 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,6 +1,6 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r1" -RDEPENDS = "util-linux-mount initramfs-uniboot initramfs-module-block initramfs-module-loop" +PR = "r3" +RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" DESCRIPTION = "An initramfs module with UI for selection of boot device." do_install() { @@ -8,4 +8,5 @@ do_install() { install -m 0755 ${WORKDIR}/30-bootmenu.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " |