forked from mirrored-repos/manjaro-tools
util-iso-mount: clean up
This commit is contained in:
parent
1702ed7aea
commit
913b9d874c
1 changed files with 2 additions and 53 deletions
|
@ -34,53 +34,6 @@ track_fs() {
|
|||
mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
|
||||
}
|
||||
|
||||
# $1: new branch
|
||||
# mount_fs_root(){
|
||||
# FS_ACTIVE_MOUNTS=()
|
||||
# mkdir -p "${mnt_dir}/work"
|
||||
# mkdir -p "$1"
|
||||
# track_fs -t overlay overlay -olowerdir="${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
|
||||
# }
|
||||
#
|
||||
# mount_fs_desktop(){
|
||||
# FS_ACTIVE_MOUNTS=()
|
||||
# mkdir -p "${mnt_dir}/work"
|
||||
# mkdir -p "$1"
|
||||
# track_fs -t overlay overlay -olowerdir="${work_dir}/desktopfs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
|
||||
# }
|
||||
#
|
||||
# mount_fs_live(){
|
||||
# FS_ACTIVE_MOUNTS=()
|
||||
# mkdir -p "${mnt_dir}/work"
|
||||
# mkdir -p "$1"
|
||||
# track_fs -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/desktopfs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
|
||||
# }
|
||||
#
|
||||
# mount_fs_net(){
|
||||
# FS_ACTIVE_MOUNTS=()
|
||||
# mkdir -p "${mnt_dir}/work"
|
||||
# mkdir -p "$1"
|
||||
# track_fs -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
|
||||
# }
|
||||
#
|
||||
# mount_fs_select(){
|
||||
# local fs="$1" pkglist="$2"
|
||||
# if [[ -f "$pkglist" ]]; then
|
||||
# mount_fs_desktop "$fs"
|
||||
# else
|
||||
# mount_fs_root "$fs"
|
||||
# fi
|
||||
# }
|
||||
#
|
||||
# mount_fs_select_boot(){
|
||||
# local fs="$1" pkglist="$2"
|
||||
# if [[ -f "$pkglist" ]]; then
|
||||
# mount_fs_live "$fs"
|
||||
# else
|
||||
# mount_fs_net "$fs"
|
||||
# fi
|
||||
# }
|
||||
|
||||
mount_fs(){
|
||||
FS_ACTIVE_MOUNTS=()
|
||||
local lower= upper="$1" work="$2" pkglist="$3"
|
||||
|
@ -92,15 +45,11 @@ mount_fs(){
|
|||
desktopfs) lower="$rootfs" ;;
|
||||
livefs|mhwdfs)
|
||||
lower="$rootfs"
|
||||
if [[ -f $pkglist ]];then
|
||||
lower="$desktopfs":"$rootfs"
|
||||
fi
|
||||
[[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
|
||||
;;
|
||||
bootfs)
|
||||
lower="$livefs":"$rootfs"
|
||||
if [[ -f $pkglist ]];then
|
||||
lower="$livefs":"$desktopfs":"$rootfs"
|
||||
fi
|
||||
[[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
|
||||
;;
|
||||
esac
|
||||
track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
|
||||
|
|
Loading…
Reference in a new issue