arch fixes plus name subvols by distro in prep for multi-distro

[automated-distro-installer] / fai / config / hooks / partition.DEFAULT

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index adb7b629e6b8bc243a323106b6c25247c35e9258..0dbc3769d3388219e49143253f79c19a9bc97c7b 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -6,7 +6,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 # # fai's setup-storage won't do btrfs on luks,
 # # so we do it ourself :)
 
-skiptask partition ||: # for running out of fai
+skiptask partition || ! type skiptask # for running not in fai
 
 #### begin configuration
 
@@ -33,10 +33,19 @@ elif ifclass MANY_DISK; then
 else
     exit 1
 fi
+
+if [[ ! $DISTRO ]]; then
+    if ifclass STABLE; then
+        DISTRO=debianjessie
+    else
+        DISTRO=debiantesting
+    fi
+fi
+
 ##### end configuration
 
 
-bpart() {
+bpart() { # btrfs a partition
     dev_n=$1
     case ${#@} in
         [1-3]) mkfs.btrfs -f $@ ;;
@@ -88,7 +97,7 @@ swap_mib=$(( $(grep ^MemTotal: /proc/meminfo | \
 # fully 1MiB unit partitions for easy resizing of the last partition.
 # Otherwise we would pass in -0 for the end argument for the last partition.
 disk_mib=$(( $(parted -m ${devs[0]} unit MiB print | \
-                  sed -nr "s#^${devs[0]}:([0-9]+).*#\1#p") - 1))
+                      sed -nr "s#^${devs[0]}:([0-9]+).*#\1#p") - 1))
 root_end=$(( disk_mib - swap_mib - boot_mib ))
 swap_end=$(( root_end + swap_mib))
 
@@ -96,7 +105,15 @@ mkdir -p /tmp/fai
 shopt -s nullglob
 if $partition; then
     for dev in ${devs[@]}; do
-        for x in $dev[0-9]; do wipefs -a $x; done
+        for x in $dev[0-9]; do
+            count_down=10
+            # wipefs has failed, manual run works, google suggests timing issue
+            while ! wipefs -a $x; do
+                sleep 2
+                count_down=$((count_down - 1))
+                (( count_down > 0 )) || exit 1
+            done
+        done
     done
     for dev in ${devs[@]}; do
         parted -s $dev mklabel gpt
@@ -134,27 +151,27 @@ if $partition; then
                    --key-file $luks_dir/host-$HOSTNAME
     done
     bpart ${crypt_devs[@]/%/$rootn}
-    mount $crypt /mnt
+    bpart ${devs[@]/%/$bootn}
 else
     for dev in ${devs[@]}; do
         cryptsetup luksOpen $dev$rootn crypt_dev_${dev##/dev/}$rootn \
                    --key-file $luks_dir/host-$HOSTNAME || [[ $? == 141 ]]
     done
     sleep 1
-    mount -o subvolid=0 $crypt /mnt
-    # systemd creates subvolumes we want to delete.
-    s=($(btrfs subvolume list --sort=-path /mnt |
-                sed -rn 's#^.*path\s*(root/\S+)\s*$#\1#p'))
-    for subvol in ${s[@]}; do btrfs subvolume delete /mnt/$subvol; done
-    btrfs subvolume set-default 0 /mnt
-    btrfs subvolume delete /mnt/root
 fi
-bpart ${devs[@]/%/$bootn}
+
+mount -o subvolid=0 $crypt /mnt
+# systemd creates subvolumes we want to delete.
+s=($(btrfs subvolume list --sort=-path /mnt |
+            sed -rn "s#^.*path\s*(root_$DISTRO/\S+)\s*\$#\1#p"))
+for subvol in ${s[@]}; do btrfs subvolume delete /mnt/$subvol; done
+btrfs subvolume set-default 0 /mnt
+[[ ! -e /mnt/root_$DISTRO ]] || btrfs subvolume delete /mnt/root_$DISTRO
 
 
 ## create subvols ##
 cd /mnt
-for x in q home root; do
+for x in q home_$DISTRO root_$DISTRO; do
     btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x
 done
 for x in root/a q/a; do
@@ -163,15 +180,16 @@ for x in root/a q/a; do
     chmod 755 $x
 done
 btrfs subvolume set-default \
-      $(btrfs subvolume list . | grep 'root$' | awk '{print $2}') .
+      $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') .
 chattr -Rf +C root
 cd /
 umount /mnt
 mount $first_boot_dev /mnt
 cd /mnt
-btrfs subvolume create boot
+[[ ! -e /mnt/boot_$DISTRO ]] || btrfs subvolume delete /mnt/boot_$DISTRO
+btrfs subvolume create boot_$DISTRO
 btrfs subvolume set-default \
-      $(btrfs subvolume list . | grep 'boot$' | awk '{print $2}') .
+      $(btrfs subvolume list . | grep "boot_$DISTRO$" | awk '{print $2}') .
 cd /
 umount /mnt
 ## end create subvols ##
@@ -179,11 +197,11 @@ umount /mnt
 
 
 cat > /tmp/fai/fstab <<EOF
-$crypt  /  btrfs  noatime,subvol=/root  0 0
-$crypt  /q  btrfs  noatime,subvol=/q  0 0
+$crypt  /  btrfs  noatime,subvol=root_$DISTRO  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
-$first_boot_dev  /boot  btrfs  noatime,subvol=/boot  0 0
+$crypt  /home  btrfs  noatime,subvol=home_$DISTRO  0 0
+$first_boot_dev  /boot  btrfs  noatime,subvol=boot_$DISTRO  0 0
 EOF
 
 swaps=()