Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Update | Fix v6.20 update issue #2460

Merged
merged 3 commits into from
Jan 29, 2019
Merged

DietPi-Update | Fix v6.20 update issue #2460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6024a
v6.20
MichaIng Jan 29, 2019
6e8ea42
v6.20
MichaIng Jan 29, 2019
286d1d8
Merge pull request #2459 from Fourdee/dev
MichaIng Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dietpi/dietpi-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions rootfs/etc/profile.d/dietpi-unsupported_terminal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@