diff --git a/debian/changelog b/debian/changelog index 969828c0..51f763fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (0.68) intrepid; 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 Mon, 22 Sep 2008 11:52:22 +0100 + livecd-rootfs (0.67) intrepid; urgency=low * Bump linux-lpia to -3. diff --git a/livecd.sh b/livecd.sh index ee3191d0..7d2b7637 100755 --- a/livecd.sh +++ b/livecd.sh @@ -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 ${ROOT}sys" DEV="" COMP="main restricted"