root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-mount] move os detect loop to manjaro-chroot

Browse source
This commit is contained in:
udeved 2015-07-02 22:53:55 +02:00
parent 45c91918b2
commit 0e7d92f262
1 changed files with 29 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
lib/util-mount.sh
View file

@ -15,7 +15,7 @@ ignore_error() {
parse_fstab(){ parse_fstab(){
echo $(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' $1/etc/fstab) echo $(perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^UUID=#;' $1/etc/fstab)
# perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^/dev#;' $1/etc/fstab # perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^/dev#;' $1/etc/fstab
# perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^LABEL=#;' $1/etc/fstab # perl -ane 'printf("%s:%s\n", @F[0,1]) if $F[0] =~ m#^LABEL=#;' $1/etc/fstab
} }
@ -38,44 +38,36 @@ chroot_part_mount() {
} }
chroot_mount_partitions(){ chroot_mount_partitions(){
for os in $(get_os);do CHROOT_ACTIVE_PART_MOUNTS=()
case "${os##*:}" in CHROOT_ACTIVE_MOUNTS=()
'linux')
msg "Detected OS: $(get_os_name $os)"
CHROOT_ACTIVE_PART_MOUNTS=()
CHROOT_ACTIVE_MOUNTS=()
[[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
trap 'trap_handler' EXIT
chroot_part_mount ${os%%:*} $1 [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
local mounts=$(parse_fstab "$1") trap 'trap_handler' EXIT
for entry in ${mounts[@]}; do chroot_part_mount ${2%%:*} $1
entry=${entry//UUID=} local mounts=$(parse_fstab "$1")
local dev=${entry%:*}
local mp=${entry#*:} for entry in ${mounts[@]}; do
case "${entry#*:}" in entry=${entry//UUID=}
'/'|'/home'|'swap'|'none') continue ;; local dev=${entry%:*}
*) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;; local mp=${entry#*:}
esac case "${entry#*:}" in
done '/'|'/home'|'swap'|'none') continue ;;
*) chroot_part_mount "/dev/disk/by-uuid/${dev}" "$1${mp}" ;;
chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
# ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
# efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
chroot_mount /etc/resolv.conf "$1/etc/resolv.conf" --bind
;;
esac esac
done done
chroot_mount_conditional "! mountpoint -q '$1'" "$1" "$1" --bind &&
chroot_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev &&
chroot_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro &&
# ignore_error chroot_mount_conditional "[[ -d '$1/sys/firmware/efi/efivars' ]]" \
# efivarfs "$1/sys/firmware/efi/efivars" -t efivarfs -o nosuid,noexec,nodev &&
chroot_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
chroot_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
chroot_mount /etc/resolv.conf "$1/etc/resolv.conf" --bind
} }
chroot_mount() { chroot_mount() {
@ -120,4 +112,4 @@ chroot_api_umount() {
trap_handler(){ trap_handler(){
chroot_api_umount chroot_api_umount
chroot_part_umount chroot_part_umount
} }