* methods/gpgv.cc:

[apt.git] / debian / apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 26dfa253083f516433713b46d0fceed89a5e1117..4f7eff47bf7310e52126343a14d873c504c62c72 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,12 @@
 #  "APT::Periodic::AutocleanInterval"
 #  - Do "apt-get autoclean" every n-days (0=disable)
 #
 #  "APT::Periodic::AutocleanInterval"
 #  - Do "apt-get autoclean" every n-days (0=disable)
 #

+#  "APT::Periodic::Unattended-Upgrade"
+#  - Run the "unattended-upgrade" security upgrade script 
+#    every n-days (0=disabled)
+#    Requires the package "unattended-upgrades" and will write
+#    a log in /var/log/unattended-upgrades
+# 

 #  "APT::Archives::MaxAge",
 #  - Set maximum allowed age of a cache package file. If a cache 
 #    package file is older it is deleted (0=disable)
 #  "APT::Archives::MaxAge",
 #  - Set maximum allowed age of a cache package file. If a cache 
 #    package file is older it is deleted (0=disable)


@@ -146,7 +152,11 @@ UpdateInterval=0
 DownloadUpgradeableInterval=0
 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
 AutocleanInterval=$DownloadUpgradeableInterval
 DownloadUpgradeableInterval=0
 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
 AutocleanInterval=$DownloadUpgradeableInterval

-eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval)
+
+UnattendedUpgradeInterval=0
+eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
+

 
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power
 
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power


@@ -160,11 +170,20 @@ if which on_ac_power >/dev/null; then
     fi
 fi
 
     fi
 fi
 

+# check if we can lock the cache and if the cache is clean
+if ! apt-get check -q -q 2>/dev/null; then
+    exit 1
+fi
+
+

 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     if apt-get -qq update 2>/dev/null; then
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     if apt-get -qq update 2>/dev/null; then

+       # Could possible test access to '/var/run/dbus/system_bus_socket' has well,
+       # but I'm not sure how stable the internal pipe location is defined as
+       # being;  so for the moment just 2>/dev/null . --sladen 2007-09-27

        if which dbus-send >/dev/null; then
        if which dbus-send >/dev/null; then

-           dbus-send --system / app.apt.dbus.updated boolean:true
+           dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true

        fi
         update_stamp $UPDATE_STAMP
     fi
        fi
         update_stamp $UPDATE_STAMP
     fi


@@ -176,6 +195,12 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
     update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
 fi
 
     update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
 fi
 

+UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
+if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+    unattended-upgrade
+    update_stamp $UPGRADE_STAMP
+fi
+

 AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
 if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
     apt-get -qq autoclean
 AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
 if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
     apt-get -qq autoclean