v6.0

+ General | Swapfile generation is now completed during 1st run of
dietpi-software:
https://github.com/Fourdee/DietPi/issues/1270#issue-278797206

CHANGELOG.txt

@@ -13,6 +13,7 @@ General | FHS compliance completed. /etc/dietpi has moved to /var/lib/dietpi. RA
 General | wget: Now set to prefer IPv4 by default (generally faster): https://github.com/Fourdee/DietPi/issues/1285#issuecomment-353230187
 General | APT: Now set to force IPv4 by default (generally faster): https://github.com/Fourdee/DietPi/issues/1285#issuecomment-353230187
 General | SparkySBC: CPU gov default changed to Performance, reports of increased stability.
+General | Swapfile generation is now completed during 1st run of dietpi-software (previously boot stage): https://github.com/Fourdee/DietPi/issues/1270#issue-278797206
 DietPi-Automation | All dietpi.txt entries have been renamed and cleaned up.
 DietPi-Boot | Improved the method of initial FS_partition and FS_expansion during 1st run, via systemD services. 'fs_force_resize=' in dietpi.txt is no longer supported: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-352159930
 DietPi-Banner | IP: Will now also list the active network adapter used (eg: eth0/wlan0)

dietpi/boot

@@ -370,9 +370,6 @@
 
 		fi
 
-		#Enable/Create swapfile.
-		/DietPi/dietpi/func/dietpi-set_dphys-swapfile $(cat /DietPi/dietpi.txt | grep -m1 '^AUTO_SETUP_SWAPFILE_SIZE=' | sed 's/.*=//' )
-
 		#Generate unique Dropbear host-key:
 		rm /etc/dropbear/*key &> /dev/null
 		dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key &> /dev/null

dietpi/dietpi-software

@@ -14490,6 +14490,13 @@ _EOF_
 		# Stop Services
 		/DietPi/dietpi/dietpi-services stop
 		#------------------------------------------------------------
+		#Generate Swapfile during 1st run (moved from boot: https://github.com/Fourdee/DietPi/issues/1270#issue-278797206)
+		if (( $G_DIETPI_INSTALL_STAGE == 0 )); then
+
+			/DietPi/dietpi/func/dietpi-set_dphys-swapfile $(grep -m1 '^AUTO_SETUP_SWAPFILE_SIZE=' /DietPi/dietpi.txt | sed 's/.*=//')
+
+		fi
+		#------------------------------------------------------------
 		#Generate userdata folders:
 		Create_UserContent_Folders
 		#------------------------------------------------------------
@@ -16568,7 +16575,7 @@ _EOF_
 
 		fi
 
-		#Apply 1st run automation and ask questions.
+		#Apply 1st run automation
 		if (( $G_DIETPI_INSTALL_STAGE == 0 )); then
 
 			#Activate automation settings from dietpi.txt, if set.