root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-mount] add umount trap for mounted partitions

Browse source
This commit is contained in:
udeved 2015-07-02 09:38:23 +02:00
parent 6530d52679
commit 0bce90a41b
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/util-mount.sh
View file

@ -24,29 +24,39 @@ get_os(){
echo ${detected[@]}
}
chroot_part_mount() {
mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
}
chroot_mount_partitions(){
CHROOT_ACTIVE_PART_MOUNTS=()
[[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
trap 'chroot_part_umount' EXIT
for os in $(get_os);do
if [[ "${os##*:}" == 'linux' ]];then
msg "mount ${os##*:} ${os%%:*}"
mount ${os%%:*} $1
parse_fstab "$1/etc/fstab"
#umount $1
chroot_part_mount ${os%%:*} $chrootdir
parse_fstab "$chrootdir/etc/fstab"
#msg "umount $chrootdir"
#umount $chrootdir
fi
done
for entry in ${mounts[@]};do
entry=${entry//UUID=}
local dev=${entry%:*}
local mp=$1${entry#*:}
local mp=$chrootdir${entry#*:}
case "${entry#*:}" in
/|/home|swap) continue ;;
*)
msg2 "mount /dev/disk/by-uuid/${dev} ${mp}"
mount /dev/disk/by-uuid/${dev} ${mp}
;;
*) chroot_mount /dev/disk/by-uuid/${dev} ${mp} ;;
esac
done
}
chroot_part_umount() {
umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
unset CHROOT_ACTIVE_PART_MOUNTS
}
chroot_mount() {
mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
}