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
[distro-setup]
/
mount-latest-subvol
diff --git
a/mount-latest-subvol
b/mount-latest-subvol
index 96210c4424907040ae4f284bf88ae330158d977d..359b534337669090503de236c2ab30467c35b4dd 100644
(file)
--- a/
mount-latest-subvol
+++ b/
mount-latest-subvol
@@
-130,7
+130,14
@@
ret=0
##### begin setup fstab for subvols we care about ######
root_dev=$(awk '$2 == "/" {print $1}' /etc/mtab)
##### begin setup fstab for subvols we care about ######
root_dev=$(awk '$2 == "/" {print $1}' /etc/mtab)
-
+if [[ $root_dev == /dev/dm-* ]]; then
+ for d in /dev/mapper/*; do
+ if [[ $(readlink -f $d) == $root_dev ]]; then
+ root_dev=$d
+ break
+ fi
+ done
+fi
if cryptsetup status $root_dev &>/dev/null; then
crypt_dev=$root_dev
if cryptsetup status $root_dev &>/dev/null; then
crypt_dev=$root_dev
@@
-219,7
+226,9
@@
for vol in q a o i; do
# if latest is already mounted, make sure binds are mounted and move on
# if latest is already mounted, make sure binds are mounted and move on
- if e check-subvol-stale $d; then
+ e check-subvol-stale $d
+ # populated by check-subvol-stale if stale
+ if ! fresh_snap=$(cat /nocow/btrfs-stale/$vol 2>/dev/null); then
mnt $d
for b in ${binds[@]}; do
mnt $b
mnt $d
for b in ${binds[@]}; do
mnt $b
@@
-227,14
+236,6
@@
for vol in q a o i; do
continue
fi
continue
fi
- # populated by check-subvol-stale
- fresh_snap=$(</nocow/btrfs-stale/$vol)
- if [[ ! $fresh_snap ]]; then
- echo "$0: error. empty fresh_snap var"
- ret=1
- continue
- fi
-
umount_ret=true
unmounted=()
for dir in $(echo $d ${binds[*]}\ |tac -s\ ); do
umount_ret=true
unmounted=()
for dir in $(echo $d ${binds[*]}\ |tac -s\ ); do