summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-04-26 20:03:56 +0200
committerJulian Andres Klode <jak@debian.org>2017-05-04 22:49:48 +0200
commit496313fb8e83af2ba71f6ce3d729be687c293dfd (patch)
treee020305db1a779c453998a6cc7ff00711ef384bf /debian
parentea49b66372912354143b810e2826301d651a2b37 (diff)
Split apt-daily timer into two
The timer doing downloading runs throughout the day, whereas automatic upgrade and clean actions only happen in the morning. The upgrade service and timer have After= ordering requirements on their non-upgrade counterparts to ensure that upgrading at boot takes place after downloading. LP: #1686470
Diffstat (limited to 'debian')
-rw-r--r--debian/apt-daily-upgrade.service9
-rw-r--r--debian/apt-daily-upgrade.timer11
-rw-r--r--debian/apt-daily.service4
-rw-r--r--debian/apt-daily.timer6
-rwxr-xr-xdebian/rules2
5 files changed, 26 insertions, 6 deletions
diff --git a/debian/apt-daily-upgrade.service b/debian/apt-daily-upgrade.service
new file mode 100644
index 000000000..bf2776ac8
--- /dev/null
+++ b/debian/apt-daily-upgrade.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+Documentation=man:apt(8)
+ConditionACPower=true
+After=apt-daily.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/apt/apt.systemd.daily install
diff --git a/debian/apt-daily-upgrade.timer b/debian/apt-daily-upgrade.timer
new file mode 100644
index 000000000..79caf3b5c
--- /dev/null
+++ b/debian/apt-daily-upgrade.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+After=apt-daily.timer
+
+[Timer]
+OnCalendar=*-*-* 6:00
+RandomizedDelaySec=60m
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/debian/apt-daily.service b/debian/apt-daily.service
index 904ed5d51..4a946afdd 100644
--- a/debian/apt-daily.service
+++ b/debian/apt-daily.service
@@ -1,9 +1,9 @@
[Unit]
-Description=Daily apt activities
+Description=Daily apt download activities
Documentation=man:apt(8)
ConditionACPower=true
[Service]
Type=oneshot
-ExecStart=/usr/lib/apt/apt.systemd.daily
+ExecStart=/usr/lib/apt/apt.systemd.daily update
diff --git a/debian/apt-daily.timer b/debian/apt-daily.timer
index 8ac13b0e9..735da2440 100644
--- a/debian/apt-daily.timer
+++ b/debian/apt-daily.timer
@@ -1,11 +1,11 @@
[Unit]
-Description=Daily apt activities
+Description=Daily apt download activities
After=network-online.target
Wants=network-online.target
[Timer]
-OnCalendar=*-*-* 6:00
-RandomizedDelaySec=60m
+OnCalendar=*-*-* 6,18:00
+RandomizedDelaySec=12h
Persistent=true
[Install]
diff --git a/debian/rules b/debian/rules
index 5f990c72e..247022398 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_systemd_start:
# Do not restart "apt-daily.service" because this script runs
# unattended-upgrades. So if apt itself is upgraded as part of
# an unattended-upgrades run it would kill itself
- dh_systemd_start apt-daily.timer
+ dh_systemd_start apt-daily.timer apt-daily-upgrade.timer
override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
override_dh_auto_configure-indep: flags=-DWITH_DOC=ON