Ubuntu

Merge lp:~roadmr/ubuntu/natty/casper/709364 into lp:ubuntu/natty/casper

Proposed by Daniel Manrique on 2011-01-28
Status: Merged
Merged at revision: 858
Proposed branch: lp:~roadmr/ubuntu/natty/casper/709364
Merge into: lp:ubuntu/natty/casper
Diff against target: 49 lines (+16/-2) 2 files modified (has conflicts)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~roadmr/ubuntu/natty/casper/709364
Reviewer Review Type Date Requested Status
Colin Watson 2011-01-28 Approve on 2011-02-01
Review via email: mp+47865@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-28 14:45:40 +0000
3+++ debian/changelog 2011-01-28 21:37:21 +0000
4@@ -1,9 +1,20 @@
5+<<<<<<< TREE
6 casper (1.255) UNRELEASED; urgency=low
7
8 * Don't disable the free space notifier if using persistent storage.
9
10 -- Evan Dandrea <ev@ubuntu.com> Fri, 28 Jan 2011 14:45:09 +0000
11
12+=======
13+casper (1.255) natty; urgency=low
14+
15+ * scripts/casper-bottom/23networking: Strip quotes from DNSDOMAIN as
16+ returned by ipconfig, and sanitize the domain entry to ensure the
17+ generated /etc/resolv.conf is formatted correctly (LP: #709364).
18+
19+ -- Daniel Manrique <daniel.manrique@canonical.com> Fri, 28 Jan 2011 16:17:51 -0500
20+
21+>>>>>>> MERGE-SOURCE
22 casper (1.254) natty; urgency=low
23
24 * More fixes to the USB update-initramfs shim (LP: #591207):
25
26=== modified file 'scripts/casper-bottom/23networking'
27--- scripts/casper-bottom/23networking 2010-08-20 12:32:35 +0000
28+++ scripts/casper-bottom/23networking 2011-01-28 21:37:21 +0000
29@@ -77,7 +77,10 @@
30 if [ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ]; then
31 # create a resolv.conf if it is not present
32 cp /tmp/net-"${DEVICE}".conf /root/var/log/netboot.config
33- rc_search="$(sed -n 's/^DNSDOMAIN=//p' /tmp/net-"${DEVICE}".conf)"
34+ #ipconfig quotes DNSDOMAIN, quotes need to be removed for a correct resolv.conf
35+ rc_search="$(sed -n 's/"//g;s/^DNSDOMAIN=//p' /tmp/net-"${DEVICE}".conf)"
36+ #search might contain multiple entries but domain should only have one.
37+ rc_domain="$(sed -n -e 's/"//g;s/^DNSDOMAIN=\([^ ]\+\) *.*/\1/p' /tmp/net-"${DEVICE}".conf)"
38 rc_server0="$(sed -n 's/^IPV4DNS0=//p' /tmp/net-"${DEVICE}".conf)"
39 rc_server1="$(sed -n 's/^IPV4DNS1=//p' /tmp/net-"${DEVICE}".conf)"
40 rc_server0="nameserver ${rc_server0}"
41@@ -90,7 +93,7 @@
42 # /etc/resolv.conf
43 # Autogenerated by casper
44 search ${rc_search}
45-domain ${rc_search}
46+domain ${rc_domain}
47 ${rc_server0}
48 ${rc_server1}
49 EOF

Subscribers

People subscribed via source and target branches