launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/remove-CURRENT_RELEASE into lp:maas with lp:~jtv/maas/bug-1042877 as a prerequisite.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/remove-CURRENT_RELEASE/+merge/122063

As discussed with various team members.  Assuming the prerequisite branch lands, we no longer need CURRENT_RELEASE in maas-import-pxe-files.  This branch gets rid of it.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/remove-CURRENT_RELEASE/+merge/122063
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/remove-CURRENT_RELEASE into lp:maas.

=== modified file 'man/maas-import-pxe-files.8'
--- man/maas-import-pxe-files.8	2012-08-14 11:03:43 +0000
+++ man/maas-import-pxe-files.8	2012-08-30 13:14:17 +0000
@@ -12,7 +12,6 @@
 order to determine:
  - ARCHIVE: Location of the Ubuntu download archive
  - RELEASES: Ubuntu releases to download
- - CURRENT_RELEASE: Most up-to-date Ubuntu release
  - ARCHES: Architectures for which images should be downloaded
 
 (To support development setups that run directly from a code branch, it will
@@ -20,9 +19,10 @@
 directory).
 
 The script uses \fBwget\fP(1) to download the kernel and initrd image for
-each architecture in ARCHES and each release in RELEASES.  It will also
-download the current pre-boot loader for each architecture in ARCHES that
-uses this loader.  It always uses the loader from CURRENT_RELEASE.
+each architecture in ARCHES and each release in RELEASES.  In addition it
+copies the Intel-architecture pre-boot loader \fBpxelinux.0\fP (plus some
+of its modules such as \fBchain.c32\fP) from its installed location in
+\fI/usr/lib/syslinux/\fP.
 
 These images are the minimum that's required to start installng a node.
 During installation, a node may download its packages over the network.

=== modified file 'scripts/maas-import-pxe-files'
--- scripts/maas-import-pxe-files	2012-08-30 13:14:17 +0000
+++ scripts/maas-import-pxe-files	2012-08-30 13:14:17 +0000
@@ -29,7 +29,6 @@
 
 # The current Ubuntu release.
 STABLE_RELEASE=$(distro-info --stable)
-CURRENT_RELEASE=${CURRENT_RELEASE:-$STABLE_RELEASE}
 
 # Supported architectures.
 ARCHES=${ARCHES:-amd64 i386}

=== modified file 'src/provisioningserver/tests/test_maas_import_pxe_files.py'
--- src/provisioningserver/tests/test_maas_import_pxe_files.py	2012-08-30 13:14:17 +0000
+++ src/provisioningserver/tests/test_maas_import_pxe_files.py	2012-08-30 13:14:17 +0000
@@ -126,7 +126,6 @@
             env['ARCHES'] = arch
         if release is not None:
             env['RELEASES'] = release
-            env['CURRENT_RELEASE'] = release
 
         with open(os.devnull, 'wb') as dev_null:
             check_call(script, env=env, stdout=dev_null)