make /a a bind mount, makes shorter full paths, simpler

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index b39132aefa8b584aed1a3a1d9292a7987119f4b3..6989eb909b18b852aa9170d3c68f8d8098f3c82b 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -8,7 +8,7 @@
 # use a list of classes for our demo machine
 case $HOSTNAME in
     demohost)
-        echo "FAIBASE DEBIAN DESKTOP STABLE TWO_DISK" ;;
+        echo "FAIBASE DEBIAN DESKTOP TWO_DISK" ;;
     x2)
         echo "FAIBASE DEBIAN DESKTOP ONE_DISK" ;;
     tp)

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 31f07ec1174a7409d9097d9573680b648454dc59..0b406ecea6f7e3224c08e0188ce243a11423aad2 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -74,6 +74,11 @@ create_subvols() {
     for x in q home root; do
         btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x
     done
+    for x in root/a q/a; do
+        mkdir -p $x
+        chown 1000:1000 $x
+        chmod 755 $x
+    done
     btrfs subvolume set-default \
           $(btrfs subvolume list . | grep 'root$' | awk '{print $2}') .
     chattr -Rf +C root
@@ -154,6 +159,7 @@ fi
 cat > /tmp/fai/fstab <<EOF
 $crypt  /  btrfs  noatime,subvol=/root  0 0
 $crypt  /q  btrfs  noatime,subvol=/q  0 0
+/q/a  /a  none  bind  0 0
 $crypt  /home  btrfs  noatime,subvol=/home  0 0
 ${devs[0]}1  /boot  ext4  noatime  0 2
 EOF