Merge lp://staging/~vorlon/ubuntu/precise/resolvconf/lp.989585 into lp://staging/ubuntu/precise/resolvconf
Proposed by
Steve Langasek
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~vorlon/ubuntu/precise/resolvconf/lp.989585 |
| Merge into: | lp://staging/ubuntu/precise/resolvconf |
| Diff against target: |
1704 lines (+871/-208) 28 files modified
bin/resolvconf (+5/-2) debian/NEWS (+0/-17) debian/changelog (+82/-1) debian/control (+2/-2) debian/copyright (+8/-5) debian/po/cs.po (+43/-8) debian/po/da.po (+39/-4) debian/po/de.po (+39/-4) debian/po/es.po (+69/-13) debian/po/eu.po (+44/-11) debian/po/fi.po (+41/-6) debian/po/fr.po (+43/-8) debian/po/gl.po (+39/-4) debian/po/it.po (+43/-8) debian/po/ja.po (+43/-8) debian/po/nl.po (+42/-7) debian/po/pt.po (+41/-6) debian/po/ru.po (+44/-11) debian/po/sv.po (+42/-8) debian/po/templates.pot (+43/-7) debian/po/vi.po (+43/-8) debian/postinst (+40/-48) debian/postrm (+9/-1) debian/preinst (+6/-7) debian/resolvconf.000resolvconf.if-up (+1/-1) debian/resolvconf.resolvconf.if-down (+2/-2) debian/templates (+17/-0) man/resolvconf.8 (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~vorlon/ubuntu/precise/resolvconf/lp.989585 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kees Cook | Approve | ||
| Canonical Foundations Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Proposed fix for immutable handling in resolvconf. The debconf template
could use some review.
To post a comment you must log in.
Revision history for this message
| Kees Cook (kees) | # |
review:
Approve
Unmerged revisions
- 67. By Steve Langasek
-
Fix syntax of db_input command, which is part of why we're seeing
failures in bug #994539. - 66. By Stéphane Graber
-
releasing version 1.65ubuntu1
- 65. By Stéphane Graber
-
Merge from Debian unstable
- 64. By Steve Langasek
-
releasing version 1.63ubuntu12
- 63. By Steve Langasek
-
Adjust the debconf template based on feedback from Barry. Thanks for the
review\! - 62. By Steve Langasek
-
Instead of throwing an error that aborts the upgrade when
/etc/resolv.conf is immutable, pop a debconf error message to let the
user know what's happening, then clear the immutable flag and continue
with the installation. LP: #989585.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
