JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

buildscript: Bugfix: handle over-mounted mountpoint (#4660)

Browse Source 
Adjust the parameters when calculating the mount point
This commit is contained in:
hzyitc
2023-01-12 18:52:01 +08:00
committed by GitHub
parent 242e78034e
commit 0b437bfd75
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/functions/image/rootfs-to-image.sh
View File

@@ -33,7 +33,7 @@ create_image() {
# stage: rsync /boot
display_alert "Copying files to" "/boot"
echo -e "\nCopying files to [/boot]" >> "${DEST}"/${LOG_SUBPATH}/install.log
if [[ $(findmnt --target $MOUNT/boot -o FSTYPE -n) == vfat ]]; then
if [[ $(findmnt --noheadings --output FSTYPE --target "$MOUNT/boot" --uniq) == vfat ]]; then
# fat32
rsync -rLtWh \
--info=progress0,stats1 \
@@ -58,8 +58,8 @@ PRE_UPDATE_INITRAMFS
# DEBUG: print free space
local freespace=$(LC_ALL=C df -h)
echo -e "$freespace" >> $DEST/${LOG_SUBPATH}/debootstrap.log
display_alert "Free SD cache" "$(echo -e "$freespace" | grep $SDCARD | awk '{print $5}')" "info"
display_alert "Mount point" "$(echo -e "$freespace" | grep $MOUNT | head -1 | awk '{print $5}')" "info"
display_alert "Free SD cache" "$(echo -e "$freespace" | awk -v mp="${SDCARD}" '$6==mp {print $5}')" "info"
display_alert "Mount point" "$(echo -e "$freespace" | awk -v mp="${MOUNT}" '$6==mp {print $5}')" "info"
# stage: write u-boot, unless the deb is not there, which would happen if BOOTCONFIG=none
# exception: if we use the one from repository, install version which was downloaded from repo