Modify root directory of initrd

Change-Id: I36f489cd15ff59ec5b9b828371a87640e1e789b0
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/packaging/initrd.spec b/packaging/initrd.spec
index cec03b72a05fde56d86a9eab38760a7852a8d99d..7fe89b549706866391ef45a6773c6fe9620477a7 100644 (file)
--- a/packaging/initrd.spec
+++ b/packaging/initrd.spec
@@ -1,4 +1,4 @@
-%define _initrd_dir %{_libdir}/initrd
+%define _initrd_dir     /initrd
 %define _mnt_initrd_dir /mnt/initrd
 
 Name:           initrd

diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh
index d3ed897a6e665d31b14c736a4a0c39df534926db..b9997004b47ff2a3d9ccac81a16b7c31ba2fd8aa 100755 (executable)
--- a/scripts/mkinitrd.sh
+++ b/scripts/mkinitrd.sh
@@ -11,16 +11,16 @@ ARCH=`$UNAME -m`
 
 if [ "z$ARCH" == "zarmv7l" ]; then
        LD_LINUX="/lib/ld-linux.so.3"
-       INIT="/usr/lib/initrd/init.sh"
-       OBJECTS_SPECIFY_LIST="/usr/lib/initrd/initrd-file.list /usr/lib/initrd/initrd-file-dmverity.list @ASAN_FILE_LIST@"
+       INIT="/initrd/init.sh"
+       OBJECTS_SPECIFY_LIST="/initrd/initrd-file.list /initrd/initrd-file-dmverity.list @ASAN_FILE_LIST@"
 elif [ "z$ARCH" == "zaarch64" ]; then
        LD_LINUX="/lib64/ld-linux-aarch64.so.1"
        INIT="/usr/lib64/initrd/init.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"
-       INIT="/usr/lib/initrd/init.sh"
-       OBJECTS_SPECIFY_LIST="/usr/lib/initrd/initrd-file.list @ASAN_FILE_LIST@"
+       INIT="/initrd/init.sh"
+       OBJECTS_SPECIFY_LIST="/initrd/initrd-file.list @ASAN_FILE_LIST@"
 elif [ "z$ARCH" == "zx86-64" ]; then
        LD_LINUX="/lib64/ld-linux-x86-64.so.2"
        INIT="/usr/lib64/initrd/init.sh"
@@ -28,12 +28,12 @@ elif [ "z$ARCH" == "zx86-64" ]; then
 else
        # set as i686, need to assign properly
        LD_LINUX="/lib/ld-linux.so.2"
-       INIT="/usr/lib/initrd/init.sh"
-       OBJECTS_SPECIFY_LIST="/usr/lib/initrd/initrd-file.list @ASAN_FILE_LIST@"
+       INIT="/initrd/init.sh"
+       OBJECTS_SPECIFY_LIST="/initrd/initrd-file.list @ASAN_FILE_LIST@"
 fi
 
-DMVERITY_ROOTFS_VERIFY_HASH="/usr/lib/initrd/bin/dmverity-rootfs-verify-hash.sh"
-SECURE_BOOT_PUBLIC_KEY="/usr/lib/initrd/etc/secure-boot-public-key.pem"
+DMVERITY_ROOTFS_VERIFY_HASH="/initrd/usr/bin/dmverity-rootfs-verify-hash.sh"
+SECURE_BOOT_PUBLIC_KEY="/initrd/etc/secure-boot-public-key.pem"
 
 INITRD_ROOT=/mnt/initrd