--- 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/03/18 22:20:46	1.9
@@ -1,121 +1,269 @@
 # 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/
 
-# minimum size of hard drive needed specified in GIGABYTES
-MINSIZE=5
+# Packages to install
+%packages
+@^minimal
+@base
+@core
+-chrony
+-kexec-tools
+%end
 
 
-# Number of detected drives
+# Partitioning in pre-install
+%pre --interpreter=/bin/bash --log=/var/log/sme-partitioning.log
+
+# Read command line arguments
+if grep nolvm "/proc/cmdline" ; then NOLVM=true ; fi
+if grep noraid "/proc/cmdline" ; then NORAID=true ; fi
+echo "Command line arguments:"
+cat /proc/cmdline
+
+# Minimum size of hard drive needed specified in MB
+MINSIZE=5000
+
+# Number of detected drives and first disk size
 NDEV=0
+BASESIZE=0
+SIZEDIFF=0
 
-for DEV in $(lsblk -nl | grep disk | cut -d' ' -f1); do
-  if [ -d /sys/block/$DEV ]; then
+# Loop through block devices, keep those over MINSIZE and ensure additional drives for RAID are within 100MB of the first
+for DEV in $(lsblk -nl | grep disk | cut -d' ' -f1) ; do
+  if [ -d /sys/block/$DEV ] ; then
     REMOVABLE=`cat /sys/block/$DEV/removable`
-    if (( $REMOVABLE == 0 )); then
+    if (( $REMOVABLE == 0 )) ; then
       SIZE=`cat /sys/block/$DEV/size`
-      GB=$(($SIZE/2**21))
-      if [ $GB -gt $MINSIZE ]; then
-        DRIVES[$NDEV]=$DEV
-        ((NDEV++))
+      MB=$(($SIZE/2**11))
+      if [ $MB -gt $MINSIZE ] ; then
+        if [ $NDEV == 0 ] ; then
+          echo "First drive found: $DEV with size $MB MB"
+          DRIVES[$NDEV]=$DEV
+          BASESIZE=$MB
+          ((NDEV++))
+        else
+          SIZEDIFF=$(($MB-$BASESIZE))
+          if [ $SIZEDIFF -gt 100 ] || [ $SIZEDIFF -lt -100 ] ; then
+            echo "Drive found but size of $MB MB doesn't match $BASESIZE MB - ignoring"
+          else
+            echo "Additional drive found: $DEV with size $MB MB"
+            DRIVES[$NDEV]=$DEV
+            ((NDEV++))
+          fi
+        fi
       fi
     fi
   fi
 done
+echo "Total disks found: $NDEV"
 
-# 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
+# Calculate recommended swap size for RAID + nolvm case
+if [ -d /sys/firmware/efi ] ; then
+  DISKSPARE=$(($BASESIZE-200-500-3000))
+else
+  DISKSPARE=$(($BASESIZE-1-500-3000))
+fi
+MEMSIZE=$(awk '/^MemTotal:/{print $2}' /proc/meminfo)
+MEMSIZEMB=$(($MEMSIZE/2**10))
 
+if [ $MEMSIZEMB -lt 2000 ] ; then
+  SWAPSIZE=$((2*$MEMSIZEMB))
+elif [ $MEMSIZEMB -lt 8000 ] ; then
+  SWAPSIZE=$MEMSIZEMB
+else
+  SWAPSIZE=8000
+fi
+if [ $SWAPSIZE -gt $DISKSPARE ] ; then SWAPSIZE=$DISKSPARE ; fi
+
+# Declare useful variables
+printf -v DRIVELIST ",%s" "${DRIVES[@]}"
+if [ $NORAID ] ; then
+  DRIVELIST=${DRIVES[0]}
+else
+  DRIVELIST=${DRIVELIST:1}
+fi
+
+echo "Final drive list: $DRIVELIST"
+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 or noraid specific then set up partitioning without RAID
+  # NOTE: From this point we're appending to part-include
+  if [ ${#DRIVES[@]} == 1 ] || [ $NORAID ] ; then
+
+    # Include the EFI or biosboot 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
+    elif [ $BASESIZE -gt 2048000 ] ; then
+      printf "part biosboot --fstype=biosboot --size=1 --ondisk=%s\n" "${DRIVES[0]}" >> /tmp/part-include
+    fi
 
-%end
+    # Create boot partition
+    printf "part /boot --fstype=xfs --size=500  --label=BOOT --ondisk=%s\n" "${DRIVES[0]}" >> /tmp/part-include
+
+    # Default to LVM unless specified at command line
+    if [ $NOLVM ] ; then
+      cat >> /tmp/part-include <<EOF
+      part / --fstype=xfs --grow --size=3000 --label=ROOT --ondisk=${DRIVES[0]}
+      part swap --fstype=swap --recommended --label=SWAP --ondisk=${DRIVES[0]}
+EOF
+    else
+      cat >> /tmp/part-include <<EOF
+      part pv.01 --size=4300 --grow --ondisk=${DRIVES[0]}
+      volgroup main pv.01
+      logvol / --fstype=xfs --name=root --vgname=main --grow --size=3000
+      logvol swap --fstype=swap --name=swap --vgname=main --recommended
+EOF
+    fi
 
+  # Otherwise multiple disks - prepare for RAID
+  else
 
+    # Define EFI or biosboot and RAID partitions
+    for i in "${!DRIVES[@]}"; do
 
-# packages to install
-%packages
-@^minimal
-@base
-@core
--chrony
--kexec-tools
+      if [ -d /sys/firmware/efi ] ; then
+        printf "part raid.%s0 --size=200 --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+      elif [ $BASESIZE -gt 2048000 ] ; then
+        printf "part biosboot --fstype=biosboot --size=1 --ondisk=%s\n" "${DRIVES[$i]}" >> /tmp/part-include
+      fi
+      printf "part raid.%s1 --size=500 --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
 
-%end
+      # Default to LVM unless specified
+      if [ $NOLVM ] ; then
+        printf "part raid.%s2 --size=3000 --grow --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+        printf "part raid.%s3 --size=%s --ondisk=%s\n" "$i" "$SWAPSIZE" "${DRIVES[$i]}" >> /tmp/part-include
+      else
+        printf "part raid.%s2 --size=4300 --grow --ondisk=%s\n" "$i" "${DRIVES[$i]}" >> /tmp/part-include
+      fi
 
+    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
+
+    # Set up RAID devices
+    printf -v EFIDEVS "raid.%s0 " "${!DRIVES[@]}"
+    printf -v BOOTDEVS "raid.%s1 " "${!DRIVES[@]}"
+    printf -v ROOTDEVS "raid.%s2 " "${!DRIVES[@]}"
+    printf -v SWAPDEVS "raid.%s3 " "${!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
 
+    # Boot partition
+    printf "raid /boot --fstype=xfs --level=1 --spares=0 --device=md0 %s\n" "$BOOTDEVS" >> /tmp/part-include
+
+    # Default to LVM unless specified
+    if [ $NOLVM ] ; then
+      cat >> /tmp/part-include <<EOF
+      raid / --fstype=xfs --level=$LEVEL --spares=$SPARE --device=md1 $ROOTDEVS
+      raid swap --fstype=swap --level=$LEVEL --spares=$SPARE --device=md2 $SWAPDEVS
+EOF
+    else
+      cat >> /tmp/part-include <<EOF
+      raid pv.01 --level=$LEVEL --spares=$SPARE --device=md1 $ROOTDEVS
+      volgroup main pv.01
+      logvol / --fstype xfs --name=root --vgname=main --grow --size=3000
+      logvol swap --fstype swap --name=swap --vgname=main --recommended
+EOF
+    fi
+  fi
+fi
+
+echo "Final part-include output:"
+cat /tmp/part-include
+
+%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 /var/log/sme-partitioning.log ${sysimage}/root/
 cp -r /tmp/anaconda.log ${sysimage}/root/
 %end