Merge lp:~allenap/maas/packaging.quantal.remove-squashfs into lp:~maas-maintainers/maas/packaging.quantal

[Gavin Panella]

Remove all install-via-squashfs support.

[Andres Rodriguez (andreserl)]

Approved, though re-base this against the latest branch as there're changes and the changelog won't merge due to conflicts.

review: Approve

[Gavin Panella (allenap)]

Cheers for the review Andres.

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-13 20:42:13 +0000
+++ debian/changelog	2012-11-15 15:13:22 +0000
@@ -18,6 +18,11 @@
     it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
     didn't use /MAAS.
 
+  [ Gavin Panella ]
+  * debian/extras/99-maas: squashfs image download is no longer needed.
+  * debian/maas-cluster-controller.install: maas-import-squashfs and its
+    configuration file are no longer part of upstream.
+
  -- Andres Rodriguez <[e-mail]>  Tue, 13 Nov 2012 14:58:21 -0500
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
 
=== modified file 'debian/extras/99-maas'
--- debian/extras/99-maas	2012-10-04 18:52:27 +0000
+++ debian/extras/99-maas	2012-11-15 15:13:22 +0000
@@ -1,7 +1,4 @@
 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
-# 
+#
 # Enable launchpad personal package archives for squid-deb-proxy
 ppa.launchpad.net
-# Enable access to MAAS server HTTP to allow squashfs download
-# during install
-maas.internal.example.com # maasurl
 
=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-10-26 10:51:16 +0000
+++ debian/maas-region-controller.install	2012-11-15 15:13:22 +0000
@@ -29,8 +29,6 @@
 etc/cron.d/maas-import-pxe-files
 man/maas-import-pxe-files.8 usr/share/man/man8
 debian/tmp/etc/maas/import_pxe_files
-debian/tmp/usr/sbin/maas-import-squashfs
-debian/tmp/etc/maas/import_squashfs
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/commissioning-user-data