diff --git a/build-image.sh b/build-image.sh index 8e38a60ec4b1cfbe795af3442e5dacc940dbdb79..d1ce42c632117179e154945f9045b763ec6ed0e5 100644 --- a/build-image.sh +++ b/build-image.sh @@ -241,8 +241,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/ @@ -295,19 +295,19 @@ 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 if [ -d ${rootfs_dir}/boot/grub2 ]; then rm -rf ${rootfs_dir}/boot/grub2 fi 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} diff --git a/config/rpmlist b/config/rpmlist index 3c6a98c4258674aa13e33d813a499b07c6bed5f6..f923649cebf73c0cdac002fe3c4dc6bdb9e66b63 100644 --- a/config/rpmlist +++ b/config/rpmlist @@ -18,4 +18,5 @@ raspberrypi-kernel raspberrypi-firmware raspberrypi-bluetooth sudo +bc openEuler-repos \ No newline at end of file