--- cdrom.image/sme10/Packages/base/sme-kickstart.cfg	2021/03/18 22:20:46	1.9
+++ cdrom.image/sme10/Packages/base/sme-kickstart.cfg	2021/06/09 08:27:41	1.15
@@ -23,8 +23,13 @@ eula --agreed
 
 
 # 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/
+#this one gives curl 6 errors on netinstall while added manually works from time to time
+#url --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-10-x86_64 
+#repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-10-x86_64
+#repo --name=smeos --baseurl http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeos/x86_64/
+#repo --name=smeupdates --baseurl http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeupdates/x86_64/
+repo --name=smeos --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-10-x86_64
+repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-10-x86_64
 
 # Packages to install
 %packages
@@ -42,6 +47,7 @@ repo --name=smeupdates --baseurl=http://
 # Read command line arguments
 if grep nolvm "/proc/cmdline" ; then NOLVM=true ; fi
 if grep noraid "/proc/cmdline" ; then NORAID=true ; fi
+if grep noxfs "/proc/cmdline" ; then FSTYPE="ext4" ; else FSTYPE="xfs" ; fi 
 echo "Command line arguments:"
 cat /proc/cmdline
 
@@ -152,19 +158,19 @@ EOF
     fi
 
     # Create boot partition
-    printf "part /boot --fstype=xfs --size=500  --label=BOOT --ondisk=%s\n" "${DRIVES[0]}" >> /tmp/part-include
+    printf "part /boot --fstype=%s --size=500  --label=BOOT --ondisk=%s\n" "$FSTYPE" "${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 / --fstype=$FSTYPE --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 / --fstype=$FSTYPE --name=root --vgname=main --grow --size=3000
       logvol swap --fstype=swap --name=swap --vgname=main --recommended
 EOF
     fi
@@ -225,19 +231,19 @@ EOF
     fi
 
     # Boot partition
-    printf "raid /boot --fstype=xfs --level=1 --spares=0 --device=md0 %s\n" "$BOOTDEVS" >> /tmp/part-include
+    printf "raid /boot --fstype=%s --level=1 --spares=0 --device=md0 %s\n" "$FSTYPE" "$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 / --fstype=$FSTYPE --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 / --fstype=$FSTYPE --name=root --vgname=main --grow --size=3000
       logvol swap --fstype swap --name=swap --vgname=main --recommended
 EOF
     fi