--- cdrom.image/sme10/Packages/base/sme-kickstart.cfg	2016/07/02 11:34:04	1.4
+++ cdrom.image/sme10/Packages/base/sme-kickstart.cfg	2021/02/17 17:18:08	1.8
@@ -1,42 +1,52 @@
 # System authorization information
 auth --enableshadow --passalgo=sha512
 
-# Use CDROM installation media
-#cdrom #what about usb stick
-
-# we do not want Selinux
+# We do not want SELinux
 selinux --disabled
 
-# services to activate
+# Services to activate
 services --disabled=lm_sensors
 
-# default root pass, willbe changed in post-install process anyway
-rootpw --lock 
+# Default root pass, will be changed in post-install process anyway
+rootpw --lock
+user --name=installer --uid=9999
 
-# Accept eula
+# Accept EULA
 eula --agreed
 
-# include the partitioning logic from the pre section.
+# Partitioning from pre section
 %include /tmp/part-include
 
-# disable kdump
+# Disable kdump
 %addon com_redhat_kdump --disable
 %end
 
 
-%pre
-# pre section
-#----- partitioning logic below--------------
-# pick the first drive that is not removable and is over MINSIZE
-DIR="/sys/block"
+# Add netinstall repos
+repo --name=smeos --baseurl=http://mirror.canada.pialasse.com/releases/testing/10/smeos/x86_64/
+repo --name=smeupdates --baseurl=http://mirror.canada.pialasse.com/releases/testing/10/smeupdates/x86_64/
+
+# Packages to install
+%packages
+@^minimal
+@base
+@core
+-chrony
+-kexec-tools
+%end
 
-# minimum size of hard drive needed specified in GIGABYTES
-MINSIZE=5
 
+# Partitioning in pre-install
+%pre --interpreter=/bin/bash --log=/var/log/ks.pre01.log
+
+# Minimum size of hard drive needed specified in GB
+MINSIZE=5
 
 # Number of detected drives
 NDEV=0
 
+# Loop through block devices and keep those over MINSIZE
+# TODO: Only pair up drives of the same size
 for DEV in $(lsblk -nl | grep disk | cut -d' ' -f1); do
   if [ -d /sys/block/$DEV ]; then
     REMOVABLE=`cat /sys/block/$DEV/removable`
@@ -51,71 +61,128 @@ for DEV in $(lsblk -nl | grep disk | cut
   fi
 done
 
-# For now keep things simple and just use the first one
-# TODO:
-# * Create software RAID depending on the number of detected drives
-# * Allow non LVM install
-
-ROOTDRIVE=${DRIVES[0]}
-if [ $ROOTDRIVE == "" ] ; then
-echo "No drive suitable for installation found! Please proceed manually."
-# first in case detection fails...
-cat << EOF > /tmp/part-include
-# Clear the Master Boot Record
-zerombr
-# System bootloader configuration
-clearpart --all  --initlabel
-# Automatically create partitions, no LVM
-autopart --lvm
+# Declare useful variables
+printf -v DRIVELIST ",%s" "${DRIVES[@]}"
+DRIVELIST=${DRIVELIST:1}
+LEVEL=1
+SPARE=0
+
+# Error if detection has failed and fall back
+if [ ${#DRIVES[@]} == 0 ] ; then
+  echo "No drive suitable for installation found! Reverting to Anaconda defaults."
+
+  cat > /tmp/part-include <<EOF
+  # Clear the Master Boot Record
+  zerombr
+
+  # Clear current partitions
+  clearpart --all  --initlabel
 
+  # Automatically create partitions using LVM
+  autopart --lvm --nohome
 EOF
 
+# Otherwise clear detected devices and set up bootloader
 else
-cat <<_EOF > /tmp/part-include
-zerombr
-clearpart --all --drives=$ROOTDRIVE --initlabel
-bootloader --boot-drive=$ROOTDRIVE
-part /boot --fstype xfs --size=500 --ondisk=$ROOTDRIVE --label=BOOT
-part pv.01 --size=4500 --grow --ondisk=$ROOTDRIVE
-volgroup main pv.01
-logvol / --fstype xfs --name=root --vgname=main --grow --size=3000 --label=ROOT
-logvol swap --fstype swap --name=swap --vgname=main --recommended --label=SWAP
-_EOF
+  cat > /tmp/part-include <<EOF
+  # Clear the Master Boot Record
+  zerombr
+
+  # Clear current partitions and install bootloader
+  clearpart --all --drives=$DRIVELIST --initlabel
+  ignoredisk --only-use=$DRIVELIST
+  bootloader --location=mbr --driveorder=$DRIVELIST
+EOF
 
-fi
+  # If single disk then set up partitioning without RAID
+  # NOTE: From this point we're appending to part-include
+  if [ ${#DRIVES[@]} == 1 ] ; then
+
+    # Include the EFI partition if necessary
+    if [ -d /sys/firmware/efi ] ; then
+      printf "part /boot/efi --fstype=efi --size=200 --ondisk=%s\n" "${DRIVES[0]}" >> /tmp/part-include
+    fi
 
-%end
+    cat >> /tmp/part-include <<EOF
+    part /boot --fstype=xfs --size=500 --ondisk=${DRIVES[0]} --label=BOOT
+    part pv.01 --size=4300 --grow --ondisk=${DRIVES[0]}
+    volgroup main pv.01
+    logvol / --fstype=xfs --name=root --vgname=main --grow --size=3000 --label=ROOT
+    logvol swap --fstype=swap --name=swap --vgname=main --recommended --label=SWAP
+EOF
 
+  # Otherwise multiple disks - prepare for RAID
+  else
 
+    # Define EFI, boot and LVM RAID partitions
+    for i in "${!DRIVES[@]}"; do
+      if [ -d /sys/firmware/efi ] ; then
+        printf "part raid.%s0 --size=200 --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+      fi
+      printf "part raid.%s1 --size=500 --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+      printf "part raid.%s2 --size=4300 --grow --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+    done
+
+    # Compute RAID level
+    # from https://wiki.contribs.org/Raid
+    # 2 Drives - Software RAID 1
+    # 3 Drives - Software RAID 1 + 1 Hot-spare
+    # 4 Drives - Software RAID 6
+    # 5+ Drives - Software RAID 6 + 1 Hot-spare
+
+    if [ ${#DRIVES[@]} == 2 ] ; then
+      LEVEL=1
+      SPARE=0
+    elif [ ${#DRIVES[@]} == 3 ] ; then
+      LEVEL=1
+      SPARE=1
+    elif [ ${#DRIVES[@]} == 4 ] ; then
+      LEVEL=6
+      SPARE=0
+    else
+      LEVEL=6
+      SPARE=1
+    fi
 
-# packages to install
-%packages
-@^minimal
-@base
-@core
--chrony
--kexec-tools
+    # Set up RAID devices
+    printf -v EFIDEVS "raid.%s0 " "${!DRIVES[@]}"
+    printf -v BOOTDEVS "raid.%s1 " "${!DRIVES[@]}"
+    printf -v ROOTDEVS "raid.%s2 " "${!DRIVES[@]}"
+    
+    # Include the EFI partition if necessary
+    if [ -d /sys/firmware/efi ] ; then
+      printf "raid /boot/efi --fstype=efi --level=1 --spares=0 --device=md9 %s\n" "$EFIDEVS" >> /tmp/part-include
+    fi
 
-%end
+    printf "raid /boot --fstype=xfs --level=1 --spares=0 --device=md0 %s\n" "$BOOTDEVS" >> /tmp/part-include
+    printf "raid pv.01 --level=%s --spares=%s --device=md1 %s\n" "$LEVEL" "$SPARE" "$ROOTDEVS" >> /tmp/part-include
 
+    # Set up LVM
+    cat >> /tmp/part-include <<EOF
+    volgroup main pv.01
+    logvol / --fstype xfs --name=root --vgname=main --grow --size=3000 --label=ROOT
+    logvol swap --fstype swap --name=swap --vgname=main --recommended --label=SWAP
+EOF
 
+  fi
+fi
+
+%end
 
+
+# SME events in post-install
 %post  --interpreter=/usr/bin/bash --log=/var/log/ks.post02.log
-# before reboot performing post-install
-# this is for first alpha iso. we should put this in anaconda
-# and / or handle possible upgrade later
-/sbin/rsyslogd; 
-sleep 2; 
-/sbin/e-smith/signal-event post-install; 
-sleep 2;
-/sbin/e-smith/db configuration set UnsavedChanges no;
+userdel -r installer
+sleep 2
+/sbin/e-smith/signal-event post-install
+sleep 2
+/sbin/e-smith/db configuration set UnsavedChanges no
 touch /forcequotacheck
-
 %end
 
+
 %post  --nochroot --log=/mnt/sysimage/var/log/ks.post01.log
 #!/bin/bash
 sysimage="/mnt/sysimage"
-
 cp -r /tmp/anaconda.log ${sysimage}/root/
 %end