iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots of fixes for trisquel flidas
[distro-setup]
/
mount-latest-subvol
diff --git
a/mount-latest-subvol
b/mount-latest-subvol
index 1b0a8e23123201182ac5eb0d7a99ca626f982652..b4bec8efe51c1aec7101d4aa78b84a219b8e1bec 100644
(file)
--- a/
mount-latest-subvol
+++ b/
mount-latest-subvol
@@
-89,16
+89,25
@@
first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
fstab <<EOF
$first_root_crypt /a btrfs noatime,subvol=a 0 0
EOF
fstab <<EOF
$first_root_crypt /a btrfs noatime,subvol=a 0 0
EOF
-case $HOSTNAME in
- treetowl|x2|frodo)
- fstab <<EOF
+
+shopt -s nullglob
+
+f=(/mnt/root/btrbk/q.*)
+if [[ -e $f ]]; then
+ fstab <<EOF
$first_root_crypt /q btrfs noatime,subvol=q 0 0
$first_root_crypt /q btrfs noatime,subvol=q 0 0
-$first_root_crypt /o btrfs noatime,subvol=o 0 0
/q/p /p none bind 0 0
/q/p /p none bind 0 0
+EOF
+fi
+
+f=(/mnt/root/btrbk/o.*)
+if [[ -e $f ]]; then
+ fstab <<EOF
+$first_root_crypt /o btrfs noatime,subvol=o 0 0
/o/m /m none bind 0 0
EOF
/o/m /m none bind 0 0
EOF
- ;;
-esac
+fi
+
if [[ $HOSTNAME == frodo ]]; then
fstab <<EOF
$first_root_crypt /i btrfs noatime,subvol=i 0 0
if [[ $HOSTNAME == frodo ]]; then
fstab <<EOF
$first_root_crypt /i btrfs noatime,subvol=i 0 0