MAAS

Merge lp:~allenap/maas/disable-uefi-temporarily into lp:maas/trunk

  1. disable-uefi-temporarily
  2. Merge into trunk
Proposed by Gavin Panella on 2014-03-21
Status: Merged
Approved by: Gavin Panella on 2014-03-21
Approved revision: 2158
Merged at revision: 2157
Proposed branch: lp:~allenap/maas/disable-uefi-temporarily
Merge into: lp:maas/trunk
Diff against target: 100 lines (+21/-7)
4 files modified
etc/maas/templates/dhcp/dhcpd.conf.template (+10/-5)
required-packages/base (+0/-1)
scripts/maas-import-pxe-files (+2/-1)
src/provisioningserver/tests/test_maas_import_pxe_files.py (+9/-0)
To merge this branch: bzr merge lp:~allenap/maas/disable-uefi-temporarily
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2014-03-21 Approve on 2014-03-21
Review via email: mp+212150@code.launchpad.net

Commit Message

Temporarily disable use of the UEFI bootloader.

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

Looks good. I hope it's enough to get us going.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
2--- etc/maas/templates/dhcp/dhcpd.conf.template 2014-03-18 17:41:14 +0000
3+++ etc/maas/templates/dhcp/dhcpd.conf.template 2014-03-21 12:24:50 +0000
4@@ -8,12 +8,17 @@
5 option arch code 93 = unsigned integer 16; # RFC4578
6 {{for dhcp_subnet in dhcp_subnets}}
7 subnet {{dhcp_subnet['subnet']}} netmask {{dhcp_subnet['subnet_mask']}} {
8+
9+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
10 # EFI BC - Provide bootloader for EFI
11- if option arch = 00:07 {
12- filename "{{uefi_bootloader}}";
13- } else {
14- filename "{{bootloader}}";
15- }
16+ # if option arch = 00:07 {
17+ # filename "{{uefi_bootloader}}";
18+ # } else {
19+ # filename "{{bootloader}}";
20+ # }
21+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
22+ filename "{{bootloader}}";
23+
24 interface {{dhcp_subnet['interface']}};
25 ignore-client-uids true;
26 option subnet-mask {{dhcp_subnet['subnet_mask']}};
27
28=== modified file 'required-packages/base'
29--- required-packages/base 2014-03-21 10:11:07 +0000
30+++ required-packages/base 2014-03-21 12:24:50 +0000
31@@ -46,7 +46,6 @@
32 python-txtftp
33 python-yaml
34 rabbitmq-server
35-shim-signed
36 syslinux-common
37 tgt
38 ubuntu-cloudimage-keyring
39
40=== modified file 'scripts/maas-import-pxe-files'
41--- scripts/maas-import-pxe-files 2014-03-18 17:41:14 +0000
42+++ scripts/maas-import-pxe-files 2014-03-21 12:24:50 +0000
43@@ -382,7 +382,8 @@
44 umask a+r
45
46 update_pre_boot_loader
47- update_uefi_boot_loader
48+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
49+ # update_uefi_boot_loader
50 import_install_images
51 import_ephemeral_images
52 }
53
54=== modified file 'src/provisioningserver/tests/test_maas_import_pxe_files.py'
55--- src/provisioningserver/tests/test_maas_import_pxe_files.py 2014-03-18 20:22:07 +0000
56+++ src/provisioningserver/tests/test_maas_import_pxe_files.py 2014-03-21 12:24:50 +0000
57@@ -16,6 +16,7 @@
58
59 import os
60 from subprocess import check_call
61+from unittest import skip
62
63 from maastesting import root
64 from maastesting.factory import factory
65@@ -249,6 +250,8 @@
66 expected_contents = read_file('/usr/lib/syslinux', 'pxelinux.0')
67 self.assertThat(tftp_path, FileContains(expected_contents))
68
69+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
70+ @skip("UEFI support temporarily disabled")
71 def test_procures_pre_uefi_boot_loader(self):
72 arch = self.get_arch()
73 release = 'precise'
74@@ -269,6 +272,8 @@
75 expected_contents = read_file('/usr/lib/syslinux', 'pxelinux.0')
76 self.assertThat(tftp_path, FileContains(expected_contents))
77
78+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
79+ @skip("UEFI support temporarily disabled")
80 def test_updates_pre_uefi_boot_loader(self):
81 arch = self.get_arch()
82 release = 'precise'
83@@ -280,6 +285,8 @@
84 expected_contents = read_file('/usr/lib/shim/', 'shim.efi.signed')
85 self.assertThat(tftp_path, FileContains(expected_contents))
86
87+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
88+ @skip("UEFI support temporarily disabled")
89 def test_procures_uefi_grubnet(self):
90 arch = self.get_arch()
91 release = 'precise'
92@@ -290,6 +297,8 @@
93 expected_contents = read_file(uefi_archive, 'grubnetx64.efi.signed')
94 self.assertThat(tftp_path, FileContains(expected_contents))
95
96+ # XXX: GavinPanella 2014-03-21 bug=1295644: UEFI support disabled.
97+ @skip("UEFI support temporarily disabled")
98 def test_updates_uefi_grubnet(self):
99 arch = self.get_arch()
100 release = 'precise'