MAAS

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

  1. packaging.remove-squashfs
  2. Merge into packaging
Proposed by Gavin Panella
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 145
Merged at revision: 145
Proposed branch: lp:~allenap/maas/packaging.remove-squashfs
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 41 lines (+6/-6)
3 files modified
debian/changelog (+5/-0)
debian/extras/99-maas (+1/-4)
debian/maas-cluster-controller.install (+0/-2)
To merge this branch: bzr merge lp:~allenap/maas/packaging.remove-squashfs
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Launchpad code reviewers Pending
Review via email: mp+134086@code.launchpad.net

Commit message

Remove all install-via-squashfs support.

Description of the change

Counterpart to lp:~allenap/maas/remove-squashfs.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-06 17:36:39 +0000
3+++ debian/changelog 2012-11-13 12:13:28 +0000
4@@ -23,6 +23,11 @@
5 * debian/maas-region-controller.postinst: Remove tgt config.
6 * debian/maas-region-controller.postrm: Remove tgt config cleanup.
7
8+ [ Gavin Panella ]
9+ * debian/extras/99-maas: squashfs image download is no longer needed.
10+ * debian/maas-cluster-controller.install: maas-import-squashfs and its
11+ configuration file are no longer part of upstream.
12+
13 -- Julian Edwards <julian.edwards@canonical.com> Fri, 26 Oct 2012 12:50:20 +0200
14
15 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
16
17=== modified file 'debian/extras/99-maas'
18--- debian/extras/99-maas 2012-10-04 18:52:27 +0000
19+++ debian/extras/99-maas 2012-11-13 12:13:28 +0000
20@@ -1,7 +1,4 @@
21 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
22-#
23+#
24 # Enable launchpad personal package archives for squid-deb-proxy
25 ppa.launchpad.net
26-# Enable access to MAAS server HTTP to allow squashfs download
27-# during install
28-maas.internal.example.com # maasurl
29
30=== modified file 'debian/maas-cluster-controller.install'
31--- debian/maas-cluster-controller.install 2012-11-06 16:41:05 +0000
32+++ debian/maas-cluster-controller.install 2012-11-13 12:13:28 +0000
33@@ -18,8 +18,6 @@
34 etc/cron.d/maas-import-pxe-files
35 man/maas-import-pxe-files.8 usr/share/man/man8
36 debian/tmp/etc/maas/import_pxe_files
37-debian/tmp/usr/sbin/maas-import-squashfs
38-debian/tmp/etc/maas/import_squashfs
39 debian/tmp/usr/sbin/maas-import-ephemerals
40 debian/tmp/etc/maas/import_ephemerals
41 debian/tmp/etc/maas/commissioning-user-data

Subscribers

People subscribed via source and target branches