Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-04 16:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move MOUNTS variable into cleanup function for clarity; it's used

Browse Source 
nowhere else.
This commit is contained in:
Colin Watson 2008-09-22 11:52:12 +01:00
parent 7aba4c9dc3
commit 3a77c96af7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ livecd-rootfs (0.68) UNRELEASED; urgency=low
* Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
and manages to mount it.
* Move MOUNTS variable into cleanup function for clarity; it's used
nowhere else.
-- Colin Watson <cjwatson@ubuntu.com> Mon, 22 Sep 2008 11:46:43 +0100

5
livecd.sh
View File

@ -24,7 +24,9 @@ set -eu
# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools
cleanup() {
for mnt in $MOUNTS ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \
${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
umount $mnt || true
done
@ -152,7 +154,6 @@ ROOT=$(pwd)/chroot-livecd/ # trailing / is CRITICAL
for FS in "$@"; do
FSS="$FS${SUBARCH:+-$SUBARCH}"
IMG=livecd.${FSS}.fsimg
MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys"
DEV=""
COMP="main restricted"