Sync with Michael

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5145a5d2f52707b1fe888837f8cc98a81bcd826f..778e3cefefb9da48091f95aae9d6db9e91b18b83 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)


@@ -95,9 +101,9 @@ check_size_constraints()
 
     # check age
     if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then
 
     # check age
     if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then

-       find $Cache -name "*.deb"  -mtime +$MaxAge -and -not -mtime -$MinAge -print0 | xargs -r -0 rm -f
+       find $Cache -name "*.deb"  \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f

     elif [ ! $MaxAge -eq 0 ]; then
     elif [ ! $MaxAge -eq 0 ]; then

-       find $Cache -name "*.deb"  -mtime +$MaxAge -print0 | xargs -r -0 rm -f
+       find $Cache -name "*.deb"  -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f

     fi
     
     # check size
     fi
     
     # check size


@@ -110,7 +116,7 @@ check_size_constraints()
        MinAge=$(($MinAge*24*60*60))
 
        # reverse-sort by mtime
        MinAge=$(($MinAge*24*60*60))
 
        # reverse-sort by mtime

-       for file in $(ls -rt $Cache/*.deb); do 
+       for file in $(ls -rt $Cache/*.deb 2>/dev/null); do 

            du=$(du -s $Cache)
            size=${du%%/*}
            # check if the cache is small enough
            du=$(du -s $Cache)
            size=${du%%/*}
            # check if the cache is small enough


@@ -120,12 +126,18 @@ check_size_constraints()
 
            # check for MinAge of the file
            if [ ! $MinAge -eq 0 ]; then 
 
            # check for MinAge of the file
            if [ ! $MinAge -eq 0 ]; then 

-               mtime=$(date --date=$(date -r $file --iso-8601) +%s)
-               delta=$(($now-$mtime))
+               # check both ctime and mtime 
+               mtime=$(stat -c %Y $file)
+               ctime=$(stat -c %Z $file)
+               if [ $mtime -gt $ctime ]; then
+                   delta=$(($now-$mtime))
+               else
+                   delta=$(($now-$ctime))
+               fi

                #echo "$file ($delta), $MinAge"
                if [ $delta -le $MinAge ]; then
                    #echo "Skiping $file (delta=$delta)"
                #echo "$file ($delta), $MinAge"
                if [ $delta -le $MinAge ]; then
                    #echo "Skiping $file (delta=$delta)"

-                   continue
+                   break

                fi
            fi
 
                fi
            fi
 


@@ -140,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


@@ -176,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
     update_stamp $AUTOCLEAN_STAMP
 fi
 
     update_stamp $AUTOCLEAN_STAMP
 fi
 

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

 # check cache size 
 check_size_constraints
 # check cache size 
 check_size_constraints