disk detection, fixes for deb stable

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

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 0dbc3769d3388219e49143253f79c19a9bc97c7b..0739e91c390a0cdf1151b97d107d737ec6a117dc 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -10,30 +10,39 @@ skiptask partition || ! type skiptask # for running not in fai
 
 #### begin configuration
 
+partition=true # change to true to force a full wipe
 bootn=3
 rootn=1
 swapn=2
 bios_grubn=4
-boot_mib=750
+boot_mib=1500
+
+
+##### end configuration
+
 lastn=$bios_grubn
 
-if ifclass VM; then
-    d=vd
-else
-    d=sd
-fi
 
-letters=()
-if ifclass TWO_DISK; then
-    letters=(a b)
-elif ifclass ONE_DISK; then
-    letters=(a)
-elif ifclass MANY_DISK; then
-    for dev in /dev/${d}?; do letters+=(${dev#/dev/${d}}); done
+hds=()
+ssds=()
+cd /sys/block
+for disk in [sv]d[a-z]; do
+    case $(cat $disk/queue/rotational) in
+        0) ssds+=(/dev/$disk) ;;
+        1) hds+=(/dev/$disk) ;;
+        *) echo "$0: error: unknown /sys/block/$disk/queue/rotational: \
+$(cat $disk/queue/rotational)"; exit 1 ;;
+    esac
+done
+
+# install all ssds, or if there are none, all hdds
+if (( ${#ssds[@]} > 0 )); then
+    devs=( ${ssds[@]} )
 else
-    exit 1
+    devs=( ${hds[@]} )
 fi
 
+
 if [[ ! $DISTRO ]]; then
     if ifclass STABLE; then
         DISTRO=debianjessie
@@ -42,7 +51,6 @@ if [[ ! $DISTRO ]]; then
     fi
 fi
 
-##### end configuration
 
 
 bpart() { # btrfs a partition
@@ -53,14 +61,12 @@ bpart() { # btrfs a partition
     esac
 }
 
-devs=(${letters[@]/#//dev/${d}})
-crypt_devs=(${letters[@]/#//dev/mapper/crypt_dev_${d}})
 first_boot_dev=${devs[0]}$bootn
 
-partition=true # hardcoded for now
-
+crypt_devs=()
 # somewhat crude detection of whether to partition
 for dev in ${devs[@]}; do
+    crypt_devs+=( /dev/mapper/crypt_dev_${dev#/dev/} )
     x=($dev[0-9])
     [[ ${#x[@]}  == ${lastn} ]] || partition=true
     for (( i=1; i <= $lastn; i++ )); do
@@ -72,8 +78,6 @@ for dev in ${devs[@]}; do
     done
 done
 
-#partition=true # for temporarily override
-
 # keyfiles generated like:
 # head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost
 luks_dir=${LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks}
@@ -87,7 +91,7 @@ if ifclass demohost; then
 fi
 
 
-crypt=/dev/mapper/crypt_dev_${d##/dev/}a$rootn
+crypt=${crypt_devs[0]}$rootn
 
 bios_grub_end=4
 # 1.5 x based on https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-disk-partitioning-setup-x86.html#sect-custom-partitioning-x86
@@ -98,7 +102,7 @@ swap_mib=$(( $(grep ^MemTotal: /proc/meminfo | \
 # 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))
-root_end=$(( disk_mib - swap_mib - boot_mib ))
+root_end=$(( disk_mib - swap_mib - boot_mib /  ${#devs[@]} ))
 swap_end=$(( root_end + swap_mib))
 
 mkdir -p /tmp/fai
@@ -174,22 +178,23 @@ cd /mnt
 for x in q home_$DISTRO root_$DISTRO; do
     btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x
 done
+mkdir -p /mnt/root_$DISTRO/boot
 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_$DISTRO$" | awk '{print $2}') .
-chattr -Rf +C root
+# could set default like this, but no reason to.
+# btrfs subvolume set-default \
+    #       $(btrfs subvolume list . | grep "root_$DISTRO$" | awk '{print $2}') .
+chattr -Rf +C root_$DISTRO
 cd /
 umount /mnt
-mount $first_boot_dev /mnt
+mount -o subvolid=0 $first_boot_dev /mnt
 cd /mnt
+btrfs subvolume set-default 0 /mnt
 [[ ! -e /mnt/boot_$DISTRO ]] || btrfs subvolume delete /mnt/boot_$DISTRO
 btrfs subvolume create boot_$DISTRO
-btrfs subvolume set-default \
-      $(btrfs subvolume list . | grep "boot_$DISTRO$" | awk '{print $2}') .
 cd /
 umount /mnt
 ## end create subvols ##