From 69c69640eb63b4193d9c6bb3de9a8f7de5a1f380 Mon Sep 17 00:00:00 2001 From: yafen Date: Sat, 1 Jan 2022 02:56:30 +0800 Subject: [PATCH] bugfix when write /etc/fstab --- scripts/build-image-common.sh | 4 +++- scripts/build-image.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh index 884fc44..fe2dedb 100644 --- a/scripts/build-image-common.sh +++ b/scripts/build-image-common.sh @@ -537,11 +537,13 @@ make_img(){ mkdir -p ${root_mnt} ${boot_mnt} mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt} mount -t ext4 ${rootp} ${root_mnt} + prefix_len=${#loopX} + let prefix_len=prefix_len+13 fstab_array=("" "" "" "") for line in `blkid | grep /dev/mapper/${loopX}p` do partuuid=${line#*PARTUUID=\"} - fstab_array[${line:18:1}]=${partuuid%%\"*} + fstab_array[${line:$prefix_len:1}]=${partuuid%%\"*} done echo "PARTUUID=${fstab_array[3]} / ext4 defaults,noatime 0 0" > ${rootfs_dir}/etc/fstab echo "PARTUUID=${fstab_array[1]} /boot vfat defaults,noatime 0 0" >> ${rootfs_dir}/etc/fstab diff --git a/scripts/build-image.sh b/scripts/build-image.sh index 495a2c0..2bb4c9d 100644 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -309,11 +309,13 @@ make_img(){ mkdir -p ${root_mnt} ${boot_mnt} mount -t vfat -o uid=root,gid=root,umask=0000 ${bootp} ${boot_mnt} mount -t ext4 ${rootp} ${root_mnt} + prefix_len=${#loopX} + let prefix_len=prefix_len+13 fstab_array=("" "" "" "") for line in `blkid | grep /dev/mapper/${loopX}p` do partuuid=${line#*PARTUUID=\"} - fstab_array[${line:18:1}]=${partuuid%%\"*} + fstab_array[${line:$prefix_len:1}]=${partuuid%%\"*} done echo "PARTUUID=${fstab_array[3]} / ext4 defaults,noatime 0 0" > ${rootfs_dir}/etc/fstab echo "PARTUUID=${fstab_array[1]} /boot vfat defaults,noatime 0 0" >> ${rootfs_dir}/etc/fstab -- Gitee