From 9757702eca8b58c1c82e67b1dec1d146a38ff24b Mon Sep 17 00:00:00 2001 From: yafen Date: Thu, 12 Aug 2021 06:18:25 +0800 Subject: [PATCH 1/2] RPi image: change uuid to partuuid --- script/step/make_raspi_image.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/step/make_raspi_image.sh b/script/step/make_raspi_image.sh index e013922..926f20d 100644 --- a/script/step/make_raspi_image.sh +++ b/script/step/make_raspi_image.sh @@ -193,16 +193,16 @@ make_img(){ fstab_array=("" "" "" "") for line in `blkid | grep /dev/mapper/${loopX}p` do - uuid=${line#*UUID=\"} - fstab_array[${line:18:1}]=${uuid%%\"*} + partuuid=${line#*PARTUUID=\"} + fstab_array[${line:18:1}]=${partuuid%%\"*} done - echo "UUID=${fstab_array[3]} / ext4 defaults,noatime 0 0" > ${rootfs_dir}/etc/fstab - echo "UUID=${fstab_array[1]} /boot vfat defaults,noatime 0 0" >> ${rootfs_dir}/etc/fstab - echo "UUID=${fstab_array[2]} swap swap defaults,noatime 0 0" >> ${rootfs_dir}/etc/fstab + 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 + echo "PARTUUID=${fstab_array[2]} swap swap defaults,noatime 0 0" >> ${rootfs_dir}/etc/fstab cp -a ${rootfs_dir}/boot/* ${boot_mnt}/ cp ${euler_dir}/config.txt ${boot_mnt}/ - echo "console=serial0,115200 console=tty1 root=/dev/mmcblk0p3 rootfstype=ext4 elevator=deadline rootwait" > ${boot_mnt}/cmdline.txt + echo "console=serial0,115200 console=tty1 root=PARTUUID=${fstab_array[3]} rootfstype=ext4 elevator=deadline rootwait" > ${boot_mnt}/cmdline.txt rm -rf ${rootfs_dir}/boot rsync -avHAXq ${rootfs_dir}/* ${root_mnt} -- Gitee From 0bbefc34d6691c2d73495a1e31693296aa32edab Mon Sep 17 00:00:00 2001 From: yafen Date: Thu, 12 Aug 2021 06:41:39 +0800 Subject: [PATCH 2/2] RPi image: bug fix, rm useless dir --- script/step/make_raspi_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/step/make_raspi_image.sh b/script/step/make_raspi_image.sh index 926f20d..9967bdb 100644 --- a/script/step/make_raspi_image.sh +++ b/script/step/make_raspi_image.sh @@ -135,8 +135,8 @@ make_rootfs(){ # mkdir -p $rootfs_dir/etc/sysconfig/network-scripts #fi cp ${euler_dir}/ifcfg-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifcfg-eth0 - mkdir -p ${rootfs_dir}/usr/bin ${rootfs_dir}/lib/udev/rules.d ${rootfs_dir}/lib/systemd/system - if [ -d ${rootfs_dir}/usr/share/licenses/raspi ]; then + mkdir -p ${rootfs_dir}/lib/udev/rules.d + if [ ! -d ${rootfs_dir}/usr/share/licenses/raspi ]; then mkdir -p ${rootfs_dir}/usr/share/licenses/raspi fi cp ${euler_dir}/*.rules ${rootfs_dir}/lib/udev/rules.d/ -- Gitee