mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

initramfs-framework:rootfs: fix some conditional check

Browse Source 
Drop a duplicated check for "PARTLABEL=", also change to use elif to
avoid go through all the checks for root parameter.

(From OE-Core rev: 29e1e2ad0b6fd0db0e099831ba331b4ffa2b094b)

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ming Liu
2021-03-24 13:37:58 +01:00
committed by Richard Purdie
parent a7e1bbaf6d
commit fef6805f68
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/initrdscripts/initramfs-framework/rootfs
+3 -14
View File
@@ -24,24 +24,13 @@ rootfs_run() {
if [ "`echo ${bootparam_root} | cut -c1-5`" = "UUID=" ]; then if [ "`echo ${bootparam_root} | cut -c1-5`" = "UUID=" ]; then
root_uuid=`echo $bootparam_root | cut -c6-` root_uuid=`echo $bootparam_root | cut -c6-`
bootparam_root="/dev/disk/by-uuid/$root_uuid" bootparam_root="/dev/disk/by-uuid/$root_uuid"
fi elif [ "`echo ${bootparam_root} | cut -c1-9`" = "PARTUUID=" ]; then
if [ "`echo ${bootparam_root} | cut -c1-9`" = "PARTUUID=" ]; then
root_partuuid=`echo $bootparam_root | cut -c10-` root_partuuid=`echo $bootparam_root | cut -c10-`
bootparam_root="/dev/disk/by-partuuid/$root_partuuid" bootparam_root="/dev/disk/by-partuuid/$root_partuuid"
fi elif [ "`echo ${bootparam_root} | cut -c1-10`" = "PARTLABEL=" ]; then
if [ "`echo ${bootparam_root} | cut -c1-10`" = "PARTLABEL=" ]; then
root_partlabel=`echo $bootparam_root | cut -c11-` root_partlabel=`echo $bootparam_root | cut -c11-`
bootparam_root="/dev/disk/by-partlabel/$root_partlabel" bootparam_root="/dev/disk/by-partlabel/$root_partlabel"
fi elif [ "`echo ${bootparam_root} | cut -c1-6`" = "LABEL=" ]; then
if [ "`echo ${bootparam_root} | cut -c1-10`" = "PARTLABEL=" ]; then
root_partlabel=`echo $bootparam_root | cut -c11-`
bootparam_root="/dev/disk/by-partlabel/$root_partlabel"
fi
if [ "`echo ${bootparam_root} | cut -c1-6`" = "LABEL=" ]; then
root_label=`echo $bootparam_root | cut -c7-` root_label=`echo $bootparam_root | cut -c7-`
bootparam_root="/dev/disk/by-label/$root_label" bootparam_root="/dev/disk/by-label/$root_label"
fi fi