diff options
| author | anonym <anonym@riseup.net> | 2015-06-12 19:59:46 +0200 |
|---|---|---|
| committer | anonym <anonym@riseup.net> | 2015-06-12 19:59:46 +0200 |
| commit | ac0c4c92b3055015d349a935e0e7189ebc758a54 (patch) | |
| tree | bada000cd2e6e9c0daa3b334c3f5b731bbaced6b /config/chroot_local-patches | |
| parent | 4e2cba27482444ebc41fc43bb09e9aa9843b15ff (diff) | |
| parent | 9ff19766e1aca75a4ae99df6769cdd817637d892 (diff) | |
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts:
features/step_definitions/erase_memory.rb
wiki/src/contribute/design/Time_syncing.mdwn
Diffstat (limited to 'config/chroot_local-patches')
| -rw-r--r-- | config/chroot_local-patches/do-not-modify-hardware-clock.diff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/chroot_local-patches/do-not-modify-hardware-clock.diff b/config/chroot_local-patches/do-not-modify-hardware-clock.diff new file mode 100644 index 0000000..ee1e6e5 --- /dev/null +++ b/config/chroot_local-patches/do-not-modify-hardware-clock.diff @@ -0,0 +1,11 @@ +--- a/etc/init.d/hwclock.sh 2015-05-16 10:47:58.445109125 +0000 ++++ b/etc/init.d/hwclock.sh 2015-05-16 10:48:20.140450601 +0000 +@@ -25,7 +25,7 @@ + # Required-Stop: $local_fs + # Default-Start: S + # X-Start-Before: checkroot +-# Default-Stop: 0 6 ++# Default-Stop: + ### END INIT INFO + + # These defaults are user-overridable in /etc/default/hwclock |