Merge pull request #2459 from Fourdee/dev

DietPi-Update | Fix v6.20 update issue
MichaIng · Jan 29, 2019 · 286d1d8 · 286d1d8
2 parents cedfa20 + 6e8ea42
commit 286d1d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dietpi/dietpi-update b/dietpi/dietpi-update
@@ -340,18 +340,19 @@ Do you wish to continue and update DietPi to v$COREVERSION_SERVER.$SUBVERSION_SE
 
 			#Remove folders of "non-critical scripts" before updating them. (eg: so we dont need to patch for /conf/* file removals)
 			#	:https://github.com/Fourdee/DietPi/issues/905#issuecomment-298241622
-			# rm -R /DietPi/dietpi/func
 			# rm -R /DietPi/dietpi/misc
 
 			l_message='Copy DietPi core files to RAMdisk' G_RUN_CMD cp -Rf DietPi-"$GITBRANCH_TARGET"/dietpi /DietPi/
 			l_message='Copy DietPi rootfs files in place' G_RUN_CMD cp -Rf DietPi-"$GITBRANCH_TARGET"/rootfs/. /
-
 			l_message='Set execute permissions for DietPi scripts' G_RUN_CMD chmod -R +x /DietPi/dietpi /var/lib/dietpi/services /etc/cron.*/dietpi
 			systemctl daemon-reload
 
 			#Verify/update dietpi.txt entries:
 			/DietPi/dietpi/func/dietpi-set_software verify_dietpi.txt
 
+			#Assure to resolve async issues, before running incremental patches
+			sync
+
 			G_DIETPI-NOTIFY 3 "$G_PROGRAM_NAME" 'Running incremental patching'
 			G_DIETPI-NOTIFY 2 "$INFO_CURRENT_VERSION"
 			G_DIETPI-NOTIFY 2 "$INFO_SERVER_VERSION"

diff --git a/rootfs/etc/profile.d/dietpi-unsupported_terminal.sh b/rootfs/etc/profile.d/dietpi-unsupported_terminal.sh
@@ -0,0 +1 @@
+