v6.29 (#3504)

+ DietPi-Patch | Migrate new SBCs to master branch now, as v6.29 is to be released
MichaIng · May 3, 2020 · db0a419 · db0a419
2 parents 60cf03a + bf2aba9
commit db0a419
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -141,16 +141,16 @@ _EOF_
 	# - DietPi-Update includes G_VERSIONDB_SAVE after every subversion patch from v6.27 on.
 	(( $1 )) && G_DIETPI_VERSION_SUB=$1
 
-	# Migrate newly supported SBCs from dev to beta branch, will be changed to master right before release!
+	# Migrate newly supported SBCs from dev to master branch
 	if (( $G_DIETPI_VERSION_SUB < 29 )) && [[ -f '/etc/.dietpi_hw_model_identifier' ]]; then
 
 		# NanoPi M4v2 (58)
 		# Pine H64 (45)
 		# ROCK Pi S (73)
 		if [[ $(</etc/.dietpi_hw_model_identifier) =~ ^(58|45|73)$ ]] && grep -q '^[[:blank:]]*DEV_GITBRANCH=dev' /boot/dietpi.txt; then
 
-			G_DIETPI-NOTIFY 2 'Migrating from development to DietPi beta branch'
-			G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=beta' /boot/dietpi.txt
+			G_DIETPI-NOTIFY 2 'Migrating from development to DietPi master branch'
+			G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=master' /boot/dietpi.txt
 
 		fi