Merge "Allow to specify the mount point for verityctl create" into tizen_6.5 accepted/tizen/6.5/unified/20220222.132806 submit/tizen_6.5/20220221.170828
authorKarol Lewandowski <k.lewandowsk@samsung.com>
Mon, 21 Feb 2022 15:22:18 +0000 (15:22 +0000)
committerGerrit Code Review <gerrit@review>
Mon, 21 Feb 2022 15:22:18 +0000 (15:22 +0000)
1  2 
scripts/init.sh
scripts/verityctl

diff --cc scripts/init.sh
Simple merge
index b09fd4c8e72c7cbd2e7e4b40aee8daa4326b6ee9,1e96e02f3b2f381a61e6f95c35b3b9153bb15884..8ac60044f7f8728f40b2539e32809f3117d118bf
@@@ -159,12 -164,10 +160,12 @@@ create(
                        # if [ $signing_result != 0 ]; then exit 2; fi
                        ############################################################################
  
 -                      /sbin/dmsetup create $NAME -r --table "0 $dmsetup_sectors verity 1 $ROOTFS $ROOTFS 4096 4096 \
 -                                                $dmsetup_blocks $dmsetup_hash_offset sha256 $root_hash $salt 1 ignore_zero_blocks"
 +                      # replace dmsetup to veritysetup
 +                      # veritysetup reads super block to retrieve parameters:
 +                      #       data block size, hash block size, number of data block, hashing algorithm, salt
 +                      /sbin/veritysetup --hash-offset=$hash_offset --ignore-zero-blocks open $ROOTFS $NAME $ROOTFS $root_hash
  
-                       mount /dev/mapper/$NAME /sysroot
+                       mount /dev/mapper/$NAME "$MOUNT_POINT"
                        exit 1
                elif [ "$enable" = b0b0b0b0 ]
                then