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
code cleanup, arch fixes
[automated-distro-installer]
/
arch-init
diff --git
a/arch-init
b/arch-init
index aa26ffdf68ac2a9051d562282c76207645a74613..982357f0a66f16161b83f728fccf8ce6e0c32cbb 100755
(executable)
--- a/
arch-init
+++ b/
arch-init
@@
-22,7
+22,6
@@
x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
export HOSTNAME="$1"
mirror=$2
export HOSTNAME="$1"
mirror=$2
-TPPASS="$(cat /root/shadow/traci-simple)"
(( $# >= 1 )) || { echo "$0: error: need 1 or 2 arguments"; exit 1; }
(( $# >= 1 )) || { echo "$0: error: need 1 or 2 arguments"; exit 1; }
@@
-73,8
+72,7
@@
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/{a,home,boot}
- mount -o subvol=a $ROOT_PARTITION /mnt/a
+ mkdir -p /mnt/boot
mount -o subvol=boot_$DISTRO $BOOT_PARTITION /mnt/boot
fi
mount -o subvol=boot_$DISTRO $BOOT_PARTITION /mnt/boot
fi
@@
-102,6
+100,7
@@
bindmount() {
mount -o bind $source $mountpoint
}
bindmount /root/shadow /mnt/q/root/shadow
mount -o bind $source $mountpoint
}
bindmount /root/shadow /mnt/q/root/shadow
+bindmount /a /mnt/a
mkdir -p /mnt/etc/ssh
cp /etc/ssh/ssh_host_* /mnt/etc/ssh
mkdir -p /mnt/etc/ssh
cp /etc/ssh/ssh_host_* /mnt/etc/ssh