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

diff --git a/arch-init b/arch-init
index e22b37a..37fa90b 100755
--- a/arch-init
+++ b/arch-init
@@ -48,7 +48,7 @@ export PARTITION_PROMPT=true
 # 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
@@ -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
-    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
 
@@ -101,7 +101,6 @@ bindmount() {
     mkdir -p $mountpoint
     mount -o bind $source $mountpoint
 }
-bindmount /a /mnt/a
 bindmount /root/shadow /mnt/q/root/shadow
 
 mkdir -p /mnt/etc/ssh