--- cdrom.image/sme10/Packages/base/sme-kickstart.cfg 2020/11/25 13:33:10 1.5 +++ cdrom.image/sme10/Packages/base/sme-kickstart.cfg 2021/02/17 17:18:08 1.8 @@ -9,6 +9,7 @@ services --disabled=lm_sensors # Default root pass, will be changed in post-install process anyway rootpw --lock +user --name=installer --uid=9999 # Accept EULA eula --agreed @@ -126,8 +127,8 @@ EOF # from https://wiki.contribs.org/Raid # 2 Drives - Software RAID 1 # 3 Drives - Software RAID 1 + 1 Hot-spare - # 4-6 Drives - Software RAID 5 + 1 Hot-spare - # 7+ Drives - Software RAID 6 + 1 Hot-spare + # 4 Drives - Software RAID 6 + # 5+ Drives - Software RAID 6 + 1 Hot-spare if [ ${#DRIVES[@]} == 2 ] ; then LEVEL=1 @@ -135,9 +136,9 @@ EOF elif [ ${#DRIVES[@]} == 3 ] ; then LEVEL=1 SPARE=1 - elif (( ${#DRIVES[@]} > 3 && ${#DRIVES[@]} <= 6 )) ; then - LEVEL=5 - SPARE=1 + elif [ ${#DRIVES[@]} == 4 ] ; then + LEVEL=6 + SPARE=0 else LEVEL=6 SPARE=1 @@ -150,10 +151,10 @@ EOF # Include the EFI partition if necessary if [ -d /sys/firmware/efi ] ; then - printf "raid /boot/efi --fstype=efi --level=1 --spares=%s --device=md9 %s\n" "$SPARE" "$EFIDEVS" >> /tmp/part-include + printf "raid /boot/efi --fstype=efi --level=1 --spares=0 --device=md9 %s\n" "$EFIDEVS" >> /tmp/part-include fi - printf "raid /boot --fstype=xfs --level=1 --spares=%s --device=md0 %s\n" "$SPARE" "$BOOTDEVS" >> /tmp/part-include + 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 @@ -171,11 +172,11 @@ fi # SME events in post-install %post --interpreter=/usr/bin/bash --log=/var/log/ks.post02.log -/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