bin/rsync-rootfs: allow use pre-mounted point directly

In initramfs case(/osimage/initramfs/initramfs.cgz), we observed that kernel will crash when mount dev to a 2 levels directory.(/level-1/level-2). below example will crash the kernel in initramfs: $ mount -t btrfs /dev/sda1 /opt/rootfs with this patch, initramfs can pass a pre-mounted point to this tool to avoid kernel crashing Signed-off-by: Li Zhijian <[email protected]> Signed-off-by: Philip Li <[email protected]>
fengguang · Nov 18, 2019 · a2fa846 · a2fa846
1 parent e4bd831
commit a2fa846
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bin/rsync-rootfs b/bin/rsync-rootfs
@@ -40,7 +40,7 @@ fs_type=$(blkid -o value -s TYPE $dest_partition)
 	mkfs.btrfs $opt_mkfs -L "LKP-ROOTFS" ${dest_partition} || exit
 }
 
-MNT_POINT=$(cat /proc/mounts | grep -w "$dest_partition" | cut -d' ' -f2)
+MNT_POINT=${MNT_POINT:-$(cat /proc/mounts | grep -w "$dest_partition" | cut -d' ' -f2)}
 if [ -z "$MNT_POINT" ];then
 	MNT_POINT="/opt/rootfs"
 	mkdir -p $MNT_POINT || exit