iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for broken ipv6
[distro-setup]
/
zboot
diff --git
a/zboot
b/zboot
index 3a0a46a74b33be8da8b6ceb4e53b05db326b1966..bf9c7c25a32b29c80ddf3317fa6d7c58913b1e53 100755
(executable)
--- a/
zboot
+++ b/
zboot
@@
-3,7
+3,7
@@
script=$(readlink -f -- "$BASH_SOURCE")
[[ $EUID == 0 ]] || exec sudo -E "$script" "$@"
script=$(readlink -f -- "$BASH_SOURCE")
[[ $EUID == 0 ]] || exec sudo -E "$script" "$@"
-s
ource /usr/local/lib/err
+s
et -e; . /usr/local/lib/bash-bear; set +e
# Explaining this whole thing. The host amy is used by someone else,
# Explaining this whole thing. The host amy is used by someone else,
@@
-19,6
+19,11
@@
source /usr/local/lib/err
set -x
set -x
+if [[ ! -e /mnt/root/root2-fstab || ! -e /mnt/root/root2-crypttab ]]; then
+ echo $0: "error: create /mnt/root/root2-fstab & /mnt/root/root2-crypttab from running /a/bin/fai/fai/config/hooks/partition.DEFAULT mkroot2 or mkroot2tab"
+ exit 1
+fi
+
mount -o bind /mnt/root2/root_ubuntubionic /mnt/1
cd /mnt/1
/b/ds/gen-amy-fstab ubuntubionic .
mount -o bind /mnt/root2/root_ubuntubionic /mnt/1
cd /mnt/1
/b/ds/gen-amy-fstab ubuntubionic .