iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes, upgrade nfsroot to buster
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index c2628e26def254be12ff62759eabe8e98af69d7e..b961e62ed2d7f98055204bfd1b0bd42066960fa8 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-18,8
+18,11
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-# for calling outside of FAI, first
-# - source /a/bin/fai-wrapper
+# for calling outside of FAI:
+# # need to redep and set that location so that we get luks keys
+# export FAI=/srv/fai/config
+# fai-redep
+# source /b/fai/fai-wrapper
# - set any appropriate classes with: fai-setclass OPT1... which sets CLASS_OPT1=true...
# or run eval-fai-classfile FILE
#
# - set any appropriate classes with: fai-setclass OPT1... which sets CLASS_OPT1=true...
# or run eval-fai-classfile FILE
#
@@
-318,7
+321,7
@@
bpart() { # btrfs a partition
# see README for docs about how to create these
# see README for docs about how to create these
-luks_dir=$
{LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks}
+luks_dir=$
FAI/distro-install-common/luks
luks_file=$luks_dir/host-$HOSTNAME
luks_file=$luks_dir/host-$HOSTNAME
@@
-484,7
+487,9
@@
if $partition; then
bpart ${boot_devs[@]}
else
for dev in ${devs[@]}; do
bpart ${boot_devs[@]}
else
for dev in ${devs[@]}; do
- mkfs.ext2 $(grub_extdev)
+ if [[ -e /a/bin/fai/fai-wrapper && -e /dev/mapper/$(root-cryptname) ]]; then
+ continue
+ fi
cryptsetup luksOpen $(rootdev) $(root-cryptname) \
--key-file $luks_file
done
cryptsetup luksOpen $(rootdev) $(root-cryptname) \
--key-file $luks_file
done
@@
-507,7
+512,6
@@
if [[ $DISTRO != debianstretch_bootstrap ]]; then
btrfs subvolume create root_$DISTRO
btrfs subvolume create root_$DISTRO
- mkdir -p /mnt/root_$DISTRO/boot
# could set default subvol like this, but no reason to.
# btrfs subvolume set-default \
# $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') .
# could set default subvol like this, but no reason to.
# btrfs subvolume set-default \
# $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') .
@@
-560,9
+564,10
@@
EOF
else
# note, fai creates the mountpoints listed here
cat > /tmp/fai/fstab <<EOF
else
# note, fai creates the mountpoints listed here
cat > /tmp/fai/fstab <<EOF
-$first_root_crypt / btrfs noatime,subvol=root_$DISTRO 0 0
+$first_root_crypt / btrfs
noatime,subvol=root_$DISTRO 0 0
$first_root_crypt /mnt/root btrfs nofail,noatime,subvolid=0 0 0
$first_root_crypt /mnt/root btrfs nofail,noatime,subvolid=0 0 0
-$first_boot_dev /boot btrfs nofail,noatime,subvol=$boot_vol 0 0
+$first_boot_dev /boot btrfs nofail,noatime,subvol=$boot_vol 0 0
+$first_boot_dev /mnt/boot btrfs nofail,noatime,subvolid=0 0 0
EOF
swaps=()
for dev in ${devs[@]}; do
EOF
swaps=()
for dev in ${devs[@]}; do