[Python-apps-commits] r8674 - in packages/cloud-init/trunk/debian (4 files)

[plessy at users.alioth.debian.org]

    Date: Thursday, May 10, 2012 @ 22:49:41
  Author: plessy
Revision: 8674

Revert diversion of ureadahead (r8607), track in LP: #997838.

Added:
  packages/cloud-init/trunk/debian/cloud-init.lintian-overrides
Modified:
  packages/cloud-init/trunk/debian/changelog
  packages/cloud-init/trunk/debian/cloud-init.postinst
  packages/cloud-init/trunk/debian/cloud-init.postrm

Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog	2012-05-10 22:35:14 UTC (rev 8673)
+++ packages/cloud-init/trunk/debian/changelog	2012-05-10 22:49:41 UTC (rev 8674)
@@ -10,7 +10,6 @@
     - Build-depend on CDBS >= 0.4.90~.
     - Removed XS-Python-Version and XB-Python-Version in debian/control.
   * Use Debhelper 9 (debian/control, debian/compat). 
-  * Disable diversion of ureadahead, which is not packaged in Debian. 
   * Removed debian/cloud-init.prerm as /etc/cron.d/cloudinit-updates
     seems to have been removed from the package earlier.
   * Removed unused debian/dirs file.

Added: packages/cloud-init/trunk/debian/cloud-init.lintian-overrides
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.lintian-overrides	                        (rev 0)
+++ packages/cloud-init/trunk/debian/cloud-init.lintian-overrides	2012-05-10 22:49:41 UTC (rev 8674)
@@ -0,0 +1,3 @@
+# this explicitly diverts ureadahead.conf in ureadahead package
+# see LP: #499520 and LP: #997838 for more discussion
+cloud-init binary: diversion-for-unknown-file

Modified: packages/cloud-init/trunk/debian/cloud-init.postinst
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.postinst	2012-05-10 22:35:14 UTC (rev 8673)
+++ packages/cloud-init/trunk/debian/cloud-init.postinst	2012-05-10 22:49:41 UTC (rev 8674)
@@ -115,6 +115,9 @@
 }
 
 if [ "$1" = "configure" ]; then
+   # disable ureadahead (LP: #499520, see also LP: #997838).
+   dpkg-divert --package cloud-init --rename --divert \
+      /etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
    if db_get cloud-init/datasources; then
       values="$RET"
       if [ "${values#*MaaS}" != "${values}" ]; then

Modified: packages/cloud-init/trunk/debian/cloud-init.postrm
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.postrm	2012-05-10 22:35:14 UTC (rev 8673)
+++ packages/cloud-init/trunk/debian/cloud-init.postrm	2012-05-10 22:49:41 UTC (rev 8674)
@@ -7,6 +7,8 @@
       rm -f /etc/cloud/cloud.cfg.d/90_dpkg.cfg
       ;;
    remove)
+      dpkg-divert --package cloud-init --remove --rename --divert \
+            /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
       rm -f /etc/cloud/cloud.cfg.d/90cloud-init-pipelining
       ;;
 esac