Skip to content

grml-live: make MIRROR_DIRECTORY readonly in chroot #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeha wants to merge 2 commits into
base: master
Choose a base branch
from
Open

grml-live: make MIRROR_DIRECTORY readonly in chroot #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdbcc36
grml-live: make MIRROR_DIRECTORY readonly in chroot
zeha May 28, 2026
e45b696
grml-live: recursively umount from within CHROOT_OUTPUT
zeha Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Depends:
rsync,
socat,
squashfs-tools,
util-linux (>= 2.39~),
xorriso,
${misc:Depends},
Recommends:
Expand Down
15 changes: 12 additions & 3 deletions grml-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,17 @@ else
fi
# }}}

# umount all directories {{{
# umount all directories beneath CHROOT_OUTPUT {{{
_UMOUNT_ALL_ATTEMPTED=""
umount_all() {
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
[ -n "${CHROOT_OUTPUT}" ] && [ -d "${CHROOT_OUTPUT}" ] || return 0
[ -z "${_UMOUNT_ALL_ATTEMPTED}" ] || return 0
_UMOUNT_ALL_ATTEMPTED=1
local mountpoint
while IFS= read -r mountpoint; do
einfo "Unmounting ${mountpoint} ..."
umount -R "${mountpoint}" ; eend $?

@mika mika Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICS we're now trying to unmount all mount points without taking care of any preference/ordering in mind, no matter whether it's a parent (/chroot/) or children (/chroot/proc/ + /chroot/sys/) directory, but we don't care?

@zeha zeha Jun 3, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've reworked this to ignore the parent and umount all mountpoints inside CHROOT_DIRECTORY in reverse order. this might not always work, but it shouldn't be worse than before

done < <(findmnt -k -l -n -o TARGET | awk -v path="${CHROOT_OUTPUT%/}/" 'index($0, path) == 1' | sort -r)
}
# }}}

Expand Down Expand Up @@ -744,7 +752,8 @@ mkdir -p "$CHROOT_OUTPUT" || bailout 5 "Problem with creating $CHROOT_OUTPUT"

if [ -n "${MIRROR_DIRECTORY}" ] ; then
mkdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
# -o rbind needs util-linux >= 2.39
mount -o rbind,ro=recursive "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" || bailout 5 "Failed to bind-mount ${MIRROR_DIRECTORY}"
Comment thread
zeha marked this conversation as resolved.
fi

log "Executed FAI command line:"
Expand Down