secubox/secubox-deb
1
0
Fork 0
mirror of https://github.com/CyberMind-FR/secubox-deb.git synced 2026-07-29 16:37:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(build): Safer cleanup to prevent /dev corruption

Browse Source 
- Add sync and sleep before unmounting /dev
- Check if directory still has mounts before rm -rf
- Use force unmount with fallback to lazy unmount
- Remove duplicate trap and umount function

Prevents host /dev/null and other devices from being corrupted
during build failures or cleanup.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-04-10 12:59:18 +02:00
parent 712d4b91aa
commit a98323fc34
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
image/build-live-usb.sh
View File

@ -129,12 +129,24 @@ log "═════════════════════════
cleanup() {
log "Cleaning up..."
# Unmount in reverse order of mounting
umount -lf "${ROOTFS}/dev/pts" 2>/dev/null || true
umount -lf "${ROOTFS}/proc" 2>/dev/null || true
umount -lf "${ROOTFS}/sys" 2>/dev/null || true
umount -lf "${ROOTFS}/dev" 2>/dev/null || true
# Wait and force umount /dev last (critical to not destroy host /dev)
sync
sleep 1
if mountpoint -q "${ROOTFS}/dev" 2>/dev/null; then
umount -f "${ROOTFS}/dev" 2>/dev/null || umount -lf "${ROOTFS}/dev" 2>/dev/null || true
fi
umount -lf "${WORK_DIR}/mnt/"* 2>/dev/null || true
[[ -n "${LOOP:-}" ]] && losetup -d "${LOOP}" 2>/dev/null || true
rm -rf "${WORK_DIR}" 2>/dev/null || true
# Only remove if no mounts are active
if ! mount | grep -q "${WORK_DIR}"; then
rm -rf "${WORK_DIR}" 2>/dev/null || true
else
log "WARNING: ${WORK_DIR} still has active mounts, not removing"
fi
}
trap cleanup EXIT
@ -856,23 +868,15 @@ ok "Base configuration complete"
log "3/8 Installing firmware..."
# Mount special filesystems for chroot (required for apt)
# Cleanup is handled by the cleanup() function at script exit
mount_chroot_fs() {
log "Mounting special filesystems in chroot..."
mount --bind /dev "${ROOTFS}/dev"
mount --bind /dev/pts "${ROOTFS}/dev/pts" 2>/dev/null || true
mount -t proc proc "${ROOTFS}/proc"
mount -t sysfs sysfs "${ROOTFS}/sys"
}
umount_chroot_fs() {
umount -lf "${ROOTFS}/dev/pts" 2>/dev/null || true
umount -lf "${ROOTFS}/dev" 2>/dev/null || true
umount -lf "${ROOTFS}/proc" 2>/dev/null || true
umount -lf "${ROOTFS}/sys" 2>/dev/null || true
}
# Ensure mounts are cleaned up on exit
trap 'umount_chroot_fs; cleanup' EXIT
mount_chroot_fs
cat > "${ROOTFS}/etc/apt/sources.list" <<EOF
@ -2343,7 +2347,13 @@ ok "Permissions fixed"
# ══════════════════════════════════════════════════════════════════
# Unmount special filesystems before creating squashfs
umount_chroot_fs
log "Unmounting chroot filesystems..."
umount -lf "${ROOTFS}/dev/pts" 2>/dev/null || true
sync
sleep 1
umount -f "${ROOTFS}/dev" 2>/dev/null || umount -lf "${ROOTFS}/dev" 2>/dev/null || true
umount -lf "${ROOTFS}/proc" 2>/dev/null || true
umount -lf "${ROOTFS}/sys" 2>/dev/null || true
log "7/8 Creating SquashFS filesystem..."
mkdir -p "${LIVE_DIR}/live"