diff options
| author | Nicolas Le Cam <niko.lecam@gmail.com> | 2016-06-22 21:39:38 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-31 13:13:41 +0200 |
| commit | d06d38bcc3335ee6bb448add9b91952e640dae05 (patch) | |
| tree | f5ec410be128d363f9351e18eadb49e9055e1b9c /debian/apt.systemd.daily | |
| parent | a55db465eca2c4d9f0cb6f36640ee6a70634052d (diff) | |
Use the ConditionACPower feature of systemd in the apt-daily service
.. instead of hardcoding the functionnality in the apt.systemd.daily
script.
Also make the compatibility cron job provide the same functionnality
for systems that do not use systemd.
Closes: #827930
(cherry picked from commit 51d659e7d8cdce59f910eceeee68e2c2afdb70d4)
Diffstat (limited to 'debian/apt.systemd.daily')
| -rw-r--r-- | debian/apt.systemd.daily | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/debian/apt.systemd.daily b/debian/apt.systemd.daily index ee772cc80..d034d8c1a 100644 --- a/debian/apt.systemd.daily +++ b/debian/apt.systemd.daily @@ -290,26 +290,6 @@ debug_echo() fi } -check_power(){ - # laptop check, on_ac_power returns: - # 0 (true) System is on main power - # 1 (false) System is not on main power - # 255 (false) Power status could not be determined - # Desktop systems always return 255 it seems - if which on_ac_power >/dev/null 2>&1; then - on_ac_power - POWER=$? - if [ $POWER -eq 1 ]; then - debug_echo "exit: system NOT on main power" - return 1 - elif [ $POWER -ne 0 ]; then - debug_echo "power status ($POWER) undetermined, continuing" - fi - debug_echo "system is on main power." - fi - return 0 -} - # ------------------------ main ---------------------------- if test -r /var/lib/apt/extended_states; then @@ -357,8 +337,6 @@ if [ "$VERBOSE" -ge 3 ]; then set -x fi -check_power || exit 0 - # check if we can lock the cache and if the cache is clean if which apt-get >/dev/null 2>&1 && ! eval apt-get check $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." @@ -409,9 +387,6 @@ fi # deal with BackupArchiveInterval do_cache_backup $BackupArchiveInterval -# ensure we don't do this on battery -check_power || exit 0 - # include default system language so that "apt-get update" will # fetch the right translated package descriptions if [ -r /etc/default/locale ]; then |