ubiquity

Merge lp:~cyphermox/ubiquity/oem-prepare-wifi-cleanup into lp:ubiquity

  1. oem-prepare-wifi-cleanup
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Adam Conrad
Approved revision: 6270
Merged at revision: 6270
Proposed branch: lp:~cyphermox/ubiquity/oem-prepare-wifi-cleanup
Merge into: lp:ubiquity
Diff against target: 29 lines (+11/-0)
2 files modified
bin/oem-config-prepare (+2/-0)
debian/changelog (+9/-0)
To merge this branch: bzr merge lp:~cyphermox/ubiquity/oem-prepare-wifi-cleanup
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+250215@code.launchpad.net

Commit message

Clean up after NetworkManager's system-connections files in prepare job for oem-config: we shouldn't keep wireless connections (or any, really) on the system that may have been setup by OEM, unless done *after* running oem-prepare. (LP: #1418105)

Description of the change

Clean up after NetworkManager's system-connections files in prepare job for oem-config: we shouldn't keep wireless connections (or any, really) on the system that may have been setup by OEM, unless done *after* running oem-prepare. (LP: #1418105)

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/oem-config-prepare'
2--- bin/oem-config-prepare 2013-06-12 16:41:04 +0000
3+++ bin/oem-config-prepare 2015-02-18 21:04:27 +0000
4@@ -23,6 +23,8 @@
5 rm -f /etc/udev/rules.d/70-persistent-cd.rules \
6 /etc/udev/rules.d/70-persistent-net.rules
7
8+ rm -f /etc/NetworkManager/system-connections/*
9+
10 # Potentially sensitive.
11 rm -f /home/oem/.ssh/known_hosts
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-02-18 17:38:08 +0000
16+++ debian/changelog 2015-02-18 21:04:27 +0000
17@@ -1,3 +1,12 @@
18+ubiquity (2.21.12) UNRELEASED; urgency=medium
19+
20+ * Clean up after NetworkManager's system-connections files in prepare job
21+ for oem-config: we shouldn't keep wireless connections (or any, really)
22+ on the system that may have been setup by OEM, unless done *after* running
23+ oem-prepare. (LP: #1418105)
24+
25+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 18 Feb 2015 15:49:51 -0500
26+
27 ubiquity (2.21.11) vivid; urgency=medium
28
29 * Be sure to include the top level linux-signed-* metapackage in our

Subscribers

People subscribed via source and target branches

to status/vote changes: