diff options
| author | Sunmin Lee <sunm.lee@samsung.com> | 2017-08-22 02:06:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-08-22 02:06:43 +0000 |
| commit | 8d5f8f0e3e226d8ec722d0e0ef989ef87e23c1cd (patch) | |
| tree | a8e10af98a2e8ba9e2070488370cc9d1a0c468f7 | |
| parent | 0ae690448a4442b7f3d2139d47db4dfac15bfdb7 (diff) | |
| parent | de6e8871ed7ca7409f0c1473d65d124d72838e5f (diff) | |
| download | initrd-recovery-8d5f8f0e3e226d8ec722d0e0ef989ef87e23c1cd.tar.gz initrd-recovery-8d5f8f0e3e226d8ec722d0e0ef989ef87e23c1cd.tar.bz2 initrd-recovery-8d5f8f0e3e226d8ec722d0e0ef989ef87e23c1cd.zip | |
Merge "Support blkid also in mkinitrd script" into tizen
| -rwxr-xr-x | src/initrd-recovery/mkinitrd-recovery.sh | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/initrd-recovery/mkinitrd-recovery.sh b/src/initrd-recovery/mkinitrd-recovery.sh index 0156f45..aa01d8b 100755 --- a/src/initrd-recovery/mkinitrd-recovery.sh +++ b/src/initrd-recovery/mkinitrd-recovery.sh @@ -5,6 +5,7 @@ LN="/bin/ln" SED="/bin/sed" MKDIR="/bin/mkdir" PARTX="/usr/sbin/partx" +BLKID="/usr/sbin/blkid" DIRNAME="/usr/bin/dirname" MKDIR="/bin/mkdir" LD_LINUX="/lib/ld-linux.so.3" @@ -69,15 +70,23 @@ show_help() { find_initrd_recovery_partition() { EMMC_DEVICE="/dev/mmcblk0" RET_PARTX=$("$PARTX" -s ${EMMC_DEVICE}) - PART_INITRD=${EMMC_DEVICE}p$( - echo "$RET_PARTX" | - "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' | - "$GREP" "ramdisk2" | "$CUT" -d ' ' -f 1) - if [ "z$PART_INITRD" == "z/dev/mmcblk0p" ]; then + TEST=$(echo "$RET_PARTX" | "$TR" -s ' ' | "$SED" -e '1d' -e 's/^ //' | "$CUT" -d ' ' -f 6) + if [ "z$TEST" == "z" ]; then + PART_INITRD=$("$BLKID" -L "ramdisk-recovery" -o device) + if [ "z$PART_INITRD" == "z" ]; then + PART_INITRD=$("$BLKID" -L "ramdisk" -o device) + fi + else PART_INITRD=${EMMC_DEVICE}p$( - echo "$RET_PARTX" | - "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' | - "$GREP" "ramdisk" | "$CUT" -d ' ' -f 1) + echo "$RET_PARTX" | + "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' | + "$GREP" "ramdisk2" | "$SED" 's/^ //' | "$CUT" -d ' ' -f 1) + if [ "z$PART_INITRD" == "z/dev/mmcblk0p" ]; then + PART_INITRD=${EMMC_DEVICE}p$( + echo "$RET_PARTX" | + "$TR" -s ' ' | "$TR" '[:upper:]' '[:lower:]' | + "$GREP" "ramdisk" | "$SED" 's/^ //' | "$CUT" -d ' ' -f 1) + fi fi } |