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
fixes mostly for bootstrap vol, better docs
[automated-distro-installer]
/
arch-init
diff --git
a/arch-init
b/arch-init
index e22b37a7ffdd08d7e71a47e1735b82ecf91526ca..aa26ffdf68ac2a9051d562282c76207645a74613 100755
(executable)
--- a/
arch-init
+++ b/
arch-init
@@
-18,7
+18,7
@@
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
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
+x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
export HOSTNAME="$1"
mirror=$2
export HOSTNAME="$1"
mirror=$2
@@
-48,7
+48,7
@@
export PARTITION_PROMPT=true
# to be idempotent if we fail after partitioning
already_partitioned=true
mount_out=$(mount)
# to be idempotent if we fail after partitioning
already_partitioned=true
mount_out=$(mount)
-for dir in /mnt{,/home,/boot,/
q
}; do
+for dir in /mnt{,/home,/boot,/
a
}; do
regex=" on $dir "
if [[ ! $mount_out =~ $regex ]]; then
already_partitioned=false
regex=" on $dir "
if [[ ! $mount_out =~ $regex ]]; then
already_partitioned=false
@@
-73,8
+73,8
@@
sed -ri --follow-symlinks "/^crypt_dev_\S+$rootn /d" /tmp/fai/crypttab
if ! $already_partitioned; then
mount -o subvol=root_$DISTRO $ROOT_PARTITION /mnt
if ! $already_partitioned; then
mount -o subvol=root_$DISTRO $ROOT_PARTITION /mnt
- mkdir -p /mnt/{
q
,home,boot}
- mount -o subvol=
q $ROOT_PARTITION /mnt/q
+ mkdir -p /mnt/{
a
,home,boot}
+ mount -o subvol=
a $ROOT_PARTITION /mnt/a
mount -o subvol=boot_$DISTRO $BOOT_PARTITION /mnt/boot
fi
mount -o subvol=boot_$DISTRO $BOOT_PARTITION /mnt/boot
fi
@@
-101,7
+101,6
@@
bindmount() {
mkdir -p $mountpoint
mount -o bind $source $mountpoint
}
mkdir -p $mountpoint
mount -o bind $source $mountpoint
}
-bindmount /a /mnt/a
bindmount /root/shadow /mnt/q/root/shadow
mkdir -p /mnt/etc/ssh
bindmount /root/shadow /mnt/q/root/shadow
mkdir -p /mnt/etc/ssh