X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=arch-init;h=a2517eeb5fb421a0911fce26afe8329198d55638;hp=37fa90b092111e7e829a891fadb6c7e3cef6dfcc;hb=efcfb463ceda4de1d9953da31a2c0737471e5cf8;hpb=1728af7e3060c8608c622f210d6e16f7d085d8f9

diff --git a/arch-init b/arch-init
index 37fa90b..a2517ee 100755
--- a/arch-init
+++ b/arch-init
@@ -18,16 +18,13 @@
 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
-TPPASS="$(cat /root/shadow/traci-simple)"
 
 (( $# >= 1 )) || { echo "$0: error: need 1 or 2 arguments"; exit 1; }
 
-mv /root/devbyid /usr/bin
-
 rm -f /etc/pacman.d/mirrorlist
 # https://wiki.archlinux.org/index.php/Mirrors#Sorting_mirrors
 
@@ -73,8 +70,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
-    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
 
@@ -90,8 +86,6 @@ fi
 pacstrap /mnt base
 cp /tmp/fai/{fstab,crypttab} /mnt/etc
 cp /a/bin/fai/encrypt /mnt/usr/lib/initcpio/hooks
-# not needed anymore
-#cp /usr/bin/devbyid /mnt/root
 
 cp -r /root/.ssh /mnt/root
 
@@ -102,6 +96,7 @@ bindmount() {
     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