[oe-commits] org.oe.dev initramfs-module-bootmenu: Switch from using buggy mount --guess-fstype to buggy klibc's fstype.

[pfalcon commit]

initramfs-module-bootmenu: Switch from using buggy mount --guess-fstype to buggy klibc's fstype.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: cfc33e4f8b788d5007fd0f33d399646615cc8b37
ViewMTN: http://monotone.openembedded.org/revision/info/cfc33e4f8b788d5007fd0f33d399646615cc8b37
Files:
1
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
Diffs:

#
# mt diff -r7e81d54ca851f17b5d660fdd24a636d6a707992e -rcfc33e4f8b788d5007fd0f33d399646615cc8b37
#
# 
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [dcac7a351d81139c5e5c42d7115e7df562f936a1]
#    to [f75b0281709f790d2341265a880b463f53e674d2]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [8f8e42c6e5c128c065b336db59a056006457d5b6]
#    to [3be3bf803a686aab18297d3d48a928bc8c6d1084]
# 
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	dcac7a351d81139c5e5c42d7115e7df562f936a1
+++ packages/initrdscripts/files/30-bootmenu.sh	f75b0281709f790d2341265a880b463f53e674d2
@@ -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_partition_type()
 
 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()
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	8f8e42c6e5c128c065b336db59a056006457d5b6
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	3be3bf803a686aab18297d3d48a928bc8c6d1084
@@ -1,6 +1,6 @@ SRC_URI = "file://30-bootmenu.sh"
 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/* "