Skip to content

Commit

Permalink
v6.14
Browse files Browse the repository at this point in the history
+General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/Fourdee/DietPi/issues/2026#issuecomment-414475011

+ Force removal of NTP, regardless of NTPD mode set
  • Loading branch information
Daniel (Fourdee) committed Aug 20, 2018
1 parent 5d7c70d commit 7635d6c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DietPi-Drive_Manager | Resolved an issue where custom tmpfs and/or bind entries
DietPi-Software | NAA Daemon : Resolved an issue where this would fail to progress the installation, due to a whiptail prompt behind G_RUN_CMD.
DietPi-Survey/Bugreport | Resolved an issue with failed uploads, due to Cloudflare: https://github.com/Fourdee/DietPi/issues/2022
General | Sparky SBC: Previous patch for RTL8812AU driver support, will be reapplied, as the previous patch did not succeed.
General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/Fourdee/DietPi/issues/2026#issuecomment-414475011

-----------------------------------------------------------------------------------------------------------

Expand Down
18 changes: 8 additions & 10 deletions dietpi/patch_file
Original file line number Diff line number Diff line change
Expand Up @@ -645,17 +645,15 @@ _EOF_

fi
#-------------------------------------------------------------------------------
#NTP removal, switch to systemd, if time sync is controlled by DietPi:
if ! grep -q '^[[:blank:]]*CONFIG_NTP_MODE=0' /DietPi/dietpi.txt; then
#NTP removal, switch to systemd:
killall -w /DietPi/dietpi/func/run_ntpd &> /dev/null
killall -w ntpd &> /dev/null

killall -w /DietPi/dietpi/func/run_ntpd &> /dev/null
killall -w ntpd &> /dev/null

G_AGP ntp
sed -i '/^aSOFTWARE_INSTALL_STATE\[106\]=/c\aSOFTWARE_INSTALL_STATE\[106\]=0' /DietPi/dietpi/.installed &> /dev/null
/DietPi/dietpi/func/dietpi-set_software ntpd-mode $(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^.*=//')

fi
G_AGP ntp
sed -i '/^aSOFTWARE_INSTALL_STATE\[106\]=/c\aSOFTWARE_INSTALL_STATE\[106\]=0' /DietPi/dietpi/.installed &> /dev/null
/DietPi/dietpi/func/dietpi-set_software ntpd-mode $(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^.*=//')
systemctl daemon-reload
/DietPi/dietpi/func/run_ntpd
#-------------------------------------------------------------------------------
#Move DietPi globals and login scripts into new /etc/bashrc.d location to load on all interactive shells:
mkdir -p /etc/bashrc.d
Expand Down

0 comments on commit 7635d6c

Please sign in to comment.