From 3e4caacf6356d1c5de3fd4b371ed2bdb517e874b Mon Sep 17 00:00:00 2001 From: yafen Date: Sat, 18 Sep 2021 20:58:46 +0800 Subject: [PATCH 1/3] RPi image: install package bc --- script/config/raspi_image/rpmlist | 1 + 1 file changed, 1 insertion(+) diff --git a/script/config/raspi_image/rpmlist b/script/config/raspi_image/rpmlist index 3c6a98c..f923649 100644 --- a/script/config/raspi_image/rpmlist +++ b/script/config/raspi_image/rpmlist @@ -18,4 +18,5 @@ raspberrypi-kernel raspberrypi-firmware raspberrypi-bluetooth sudo +bc openEuler-repos \ No newline at end of file -- Gitee From 085cd75cb530290212c49ff0d0aba2e0d0d19d33 Mon Sep 17 00:00:00 2001 From: yafen Date: Fri, 10 Dec 2021 23:16:28 +0800 Subject: [PATCH 2/3] RPi: bug fix sed command --- script/step/make_raspi_image.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/step/make_raspi_image.sh b/script/step/make_raspi_image.sh index 9967bdb..14d5656 100644 --- a/script/step/make_raspi_image.sh +++ b/script/step/make_raspi_image.sh @@ -124,10 +124,10 @@ make_rootfs(){ # dnf --installroot=${rootfs_dir}/ install -y raspberrypi-kernel raspberrypi-firmware openEuler-repos set +e INSTALL_PACKAGES $CONFIG_RPM_LIST - cat ${rootfs_dir}/etc/systemd/timesyncd.conf | grep "^NTP*" + cat ${rootfs_dir}/etc/systemd/timesyncd.conf | grep "^NTP=*" if [ $? -ne 0 ]; then - sed -i 's/#NTP=/NTP=0.cn.pool.ntp.org/g' ${rootfs_dir}/etc/systemd/timesyncd.conf - sed -i 's/#FallbackNTP=/FallbackNTP=1.asia.pool.ntp.org 2.asia.pool.ntp.org/g' ${rootfs_dir}/etc/systemd/timesyncd.conf + sed -i -e '/^#NTP=/cNTP=0.cn.pool.ntp.org' ${rootfs_dir}/etc/systemd/timesyncd.conf + sed -i -e '/^#FallbackNTP=/cFallbackNTP=1.asia.pool.ntp.org 2.asia.pool.ntp.org' ${rootfs_dir}/etc/systemd/timesyncd.conf fi set -e #cp ${euler_dir}/hosts ${rootfs_dir}/etc/hosts -- Gitee From 381a956cf097981fae6ca317325b1ba2c43d9817 Mon Sep 17 00:00:00 2001 From: yafen Date: Sat, 1 Jan 2022 03:18:00 +0800 Subject: [PATCH 3/3] bugfix when write /etc/fstab --- script/step/make_raspi_image.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/step/make_raspi_image.sh b/script/step/make_raspi_image.sh index 14d5656..e1bf2de 100644 --- a/script/step/make_raspi_image.sh +++ b/script/step/make_raspi_image.sh @@ -190,11 +190,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