Modify script path declaration and copy statements 27/277927/1
authorSangYoun Kwak <sy.kwak@samsung.com>
Fri, 15 Jul 2022 05:56:43 +0000 (14:56 +0900)
committerSangYoun Kwak <sy.kwak@samsung.com>
Fri, 15 Jul 2022 05:56:43 +0000 (14:56 +0900)
Change-Id: If9e721f4d82dc633f1c80cd34279a6c640330961
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
scripts/mkinitrd.sh

index 9f8bbb2c5d07561cd970d5eda947b4b76af6ea84..8bc7e2e9ab1dcadf0dc39c6144baff20e726b279 100755 (executable)
@@ -16,7 +16,6 @@ if [ "z$ARCH" == "zarmv7l" ]; then
 elif [ "z$ARCH" == "zaarch64" ]; then
        LD_LINUX="/lib64/ld-linux-aarch64.so.1"
        INIT="/usr/lib64/initrd/init.sh"
-       DMVERITY_ROOTFS_VERIFY_HASH="/usr/lib64/initrd/bin/dmverity-rootfs-verify-hash.sh"
        OBJECTS_SPECIFY_LIST="/usr/lib64/initrd/initrd-file.list /usr/lib64/initrd/initrd-file-64bit.list /usr/lib64/initrd/initrd-file-dmverity.list @ASAN_FILE_LIST@"
 elif [ "z$ARCH" == "zi686" ]; then
        LD_LINUX="/lib/ld-linux.so.2"
@@ -33,6 +32,8 @@ else
        OBJECTS_SPECIFY_LIST="/usr/lib/initrd/initrd-file.list @ASAN_FILE_LIST@"
 fi
 
+DMVERITY_ROOTFS_VERIFY_HASH="/usr/lib/initrd/bin/dmverity-rootfs-verify-hash.sh"
+
 INITRD_ROOT=/mnt/initrd
 
 #-----------------------------------------------------------------------------
@@ -165,9 +166,7 @@ make_initrd() {
     symlink_objects $SYM_LINKS
 
     "$CP" -f "$INIT" "$INITRD_ROOT/sbin/init"
-    if [ ! -z ${DMVERITY_ROOTFS_VERIFY_HASH+x} ]; then
-           "$CP" -f "$DMVERITY_ROOTFS_VERIFY_HASH" "$INITRD_ROOT/usr/bin/dmverity-rootfs-verify-hash.sh"
-    fi
+    "$CP" -f "$DMVERITY_ROOTFS_VERIFY_HASH" "$INITRD_ROOT/usr/bin/dmverity-rootfs-verify-hash.sh"
     "$TOUCH" "$INITRD_ROOT/etc/initrd-release"
 }