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 d36685f3b41e6bf717b5a31ba8f152cfe1d79bde..359b534337669090503de236c2ab30467c35b4dd 100644
(file)
--- a/
mount-latest-subvol
+++ b/
mount-latest-subvol
@@
-14,6
+14,9
@@
# limitations under the License.
# usage: mount-latest-subvol
# limitations under the License.
# usage: mount-latest-subvol
+#
+# Note, at source location, intentionally not executable, run and read
+# install-my-scripts.
cd /
[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
cd /
[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
@@
-86,7
+89,7
@@
pid-check() {
for p in ${pids}; do
for m in ${my_pids[@]}; do
if (( p == m )); then
for p in ${pids}; do
for m in ${my_pids[@]}; do
if (( p == m )); then
- echo "$0: error: pids to kill includes our pid or a parent" >&2
+ echo "$0: error: pids to kill includes our pid or a parent
. ps output:
" >&2
ps -f -p $p
exit 1
fi
ps -f -p $p
exit 1
fi
@@
-127,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
@@
-216,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
@@
-224,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