Merge lp:~cyphermox/ubuntu/lucid/resolvconf/lucid into lp:ubuntu/lucid/resolvconf
- Lucid (10.04)
- lucid
- Merge into lucid
Proposed by
Mathieu Trudel-Lapierre
Status: | Merged |
---|---|
Merge reported by: | Mathieu Trudel-Lapierre |
Merged at revision: | not available |
Proposed branch: | lp:~cyphermox/ubuntu/lucid/resolvconf/lucid |
Merge into: | lp:ubuntu/lucid/resolvconf |
Diff against target: |
287 lines (+202/-13) 6 files modified
debian/changelog (+29/-0) debian/control (+1/-1) debian/po/eu.po (+152/-0) debian/postinst (+10/-10) debian/postrm (+3/-2) man/resolvconf.8 (+7/-0) |
To merge this branch: | bzr merge lp:~cyphermox/ubuntu/lucid/resolvconf/lucid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+16081@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 18. By Mathieu Trudel-Lapierre
-
* debian/postinst:
- make sure all run files are sent to /var/run, not /lib/init/rw - 19. By Mathieu Trudel-Lapierre
-
update regex to check that /var/run is a tmpfs (LP: #386822)
- 20. By Mathieu Trudel-Lapierre
-
fix typo in comments
- 21. By Mathieu Trudel-Lapierre
-
* debian/postrm:
- remove /var/run/resolvconf, not /lib/init/ rw/resolvconf - 22. By Mathieu Trudel-Lapierre
-
also purge /var/run/
resolvconf/ interface
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2009-06-04 16:38:43 +0000 |
3 | +++ debian/changelog 2009-12-30 21:24:14 +0000 |
4 | @@ -1,3 +1,32 @@ |
5 | +resolvconf (1.45ubuntu1) lucid; urgency=low |
6 | + |
7 | + * Merge from debian unstable, remaining changes (LP: #495998): |
8 | + - bin/resolvconf: |
9 | + + fail with non-zero exit code when /etc/resolv.conf is not a symlink. |
10 | + - debian/postinst: |
11 | + + use default /var/run. |
12 | + - debian/rules: |
13 | + + don't install the init script in runlevels 0 and 6. |
14 | + * debian/postinst: |
15 | + - make sure all run files are sent to /var/run, not /lib/init/rw |
16 | + - update regex to check that /var/run is a tmpfs (LP: #386822) |
17 | + - fix typo in comments |
18 | + * debian/postrm: |
19 | + - remove /var/run/resolvconf, not /lib/init/rw/resolvconf |
20 | + - also purge /var/run/resolvconf/interface |
21 | + |
22 | + -- Mathieu Trudel <mathieu-tl@ubuntu.com> Wed, 30 Dec 2009 16:17:58 -0500 |
23 | + |
24 | +resolvconf (1.45) unstable; urgency=low |
25 | + |
26 | + [ Thomas Hood ] |
27 | + * Bump standards version |
28 | + * Add note to man page that tail file is a good place for a |
29 | + resolver "options" line (Closes: #533297) |
30 | + * Add eu.po (Closes: #534558) |
31 | + |
32 | + -- Marco Nenciarini <mnencia@debian.org> Thu, 13 Aug 2009 20:01:51 +0200 |
33 | + |
34 | resolvconf (1.44ubuntu1) karmic; urgency=low |
35 | |
36 | * Merge from debian unstable, remaining changes (LP: #384131): |
37 | |
38 | === modified file 'debian/control' |
39 | --- debian/control 2009-06-04 16:38:43 +0000 |
40 | +++ debian/control 2009-12-30 21:24:14 +0000 |
41 | @@ -9,7 +9,7 @@ |
42 | Vcs-Browser: http://svn.debian.org/wsvn/resolvconf/resolvconf/trunk |
43 | Homepage: http://alioth.debian.org/projects/resolvconf/ |
44 | Dm-Upload-Allowed: yes |
45 | -Standards-Version: 3.8.0 |
46 | +Standards-Version: 3.8.2 |
47 | |
48 | Package: resolvconf |
49 | Architecture: all |
50 | |
51 | === added file 'debian/po/eu.po' |
52 | --- debian/po/eu.po 1970-01-01 00:00:00 +0000 |
53 | +++ debian/po/eu.po 2009-12-30 21:24:14 +0000 |
54 | @@ -0,0 +1,152 @@ |
55 | +# translation of resolvconf-eu.po to Euskara |
56 | +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
57 | +# This file is distributed under the same license as the PACKAGE package. |
58 | +# |
59 | +# Piarres Beobide EGaƱa <pi@beobide.net>, 2009. |
60 | +msgid "" |
61 | +msgstr "" |
62 | +"Project-Id-Version: resolvconf-eu\n" |
63 | +"Report-Msgid-Bugs-To: resolvconf@packages.debian.org\n" |
64 | +"POT-Creation-Date: 2008-02-11 07:44+0100\n" |
65 | +"PO-Revision-Date: 2009-06-25 11:48+0200\n" |
66 | +"Last-Translator: Piarres Beobide <pi@beobide.net>\n" |
67 | +"Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n" |
68 | +"MIME-Version: 1.0\n" |
69 | +"Content-Type: text/plain; charset=UTF-8\n" |
70 | +"Content-Transfer-Encoding: 8bit\n" |
71 | +"X-Generator: KBabel 1.11.4\n" |
72 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
73 | + |
74 | +#. Type: boolean |
75 | +#. Description |
76 | +#: ../templates:2001 |
77 | +msgid "Prepare /etc/resolv.conf for dynamic updates?" |
78 | +msgstr "Prestatu /etc/resolv.conf eguneraketa dinamikoentzat?" |
79 | + |
80 | +#. Type: boolean |
81 | +#. Description |
82 | +#: ../templates:2001 |
83 | +msgid "" |
84 | +"The resolvconf package contains the infrastructure required for dynamic " |
85 | +"updating of the resolver configuration file. Part of the necessary " |
86 | +"infrastructure is a symbolic link from /etc/resolv.conf to /etc/resolvconf/" |
87 | +"run/resolv.conf. If you choose this option then this link will be created; " |
88 | +"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/" |
89 | +"resolv.conf.d/original, and will be restored if this package is removed." |
90 | +msgstr "" |
91 | +"Resolvconf paketeak ebazte konfigurazio fitxategia automatikoki " |
92 | +"eguneratzeko beharrezko azpiegitura du. Beharrezko azpiegitura " |
93 | +"horren zati bat /etc/resolv.conf eta /etc/resolvconf/run/resolv.conf " |
94 | +"arteko lotura sinboliko bat da. Aukera hau hautatuaz gero lotura " |
95 | +"hori sortu egingo da; aurreko /etc/resolv.conf fitxategia /etc/resolvconf/" |
96 | +"resolv.conf.d/original izenaz gordeko da eta paketea kentzen bada berriz " |
97 | +"bere lekuan ipiniko da." |
98 | + |
99 | +#. Type: boolean |
100 | +#. Description |
101 | +#: ../templates:2001 |
102 | +msgid "" |
103 | +"Declining this option will prevent future installations from recreating the " |
104 | +"symbolic link and therefore the resolver configuration file will not be " |
105 | +"dynamically updated. Dynamic updating can then be activated following " |
106 | +"instructions in the README file." |
107 | +msgstr "" |
108 | +"Aukera hau baztertzeak hurrengo instalazioetan lotura sortzea desgaituko du, " |
109 | +"beraz ebazte konfigurazio fitxategia ez da dinamikoki eguneratuko. " |
110 | +"Eguneraketa dinamikoa README fitxategiko argibideak jarraituaz gaitu daiteke." |
111 | + |
112 | +#. Type: boolean |
113 | +#. Description |
114 | +#: ../templates:2001 |
115 | +msgid "" |
116 | +"The presence of resolvconf can affect the behavior of other programs, so it " |
117 | +"should not be left installed if unconfigured." |
118 | +msgstr "" |
119 | +"Resolvconf egoteak beste programa batzuen portamoldea aldatu dezake, beraz " |
120 | +"ez litzateke konfiguratu gabe instalaturik utzi beharko." |
121 | + |
122 | +#. Type: note |
123 | +#. Description |
124 | +#: ../templates:3001 |
125 | +msgid "Network interfaces reconfiguration mandatory" |
126 | +msgstr "Sare interfaze birkonfigurazioa beharrezkoa" |
127 | + |
128 | +#. Type: note |
129 | +#. Description |
130 | +#: ../templates:3001 |
131 | +msgid "" |
132 | +"Once resolvconf is installed, interface configurers supply name server " |
133 | +"information to it (which it then makes available to the C library resolver " |
134 | +"and to DNS caches). However, they do this only when they bring up " |
135 | +"interfaces. Therefore for resolvconf's name server information to be up to " |
136 | +"date after initial installation it is necessary to reconfigure interfaces " |
137 | +"(that is, to take them down and then to bring them up again) and to restart " |
138 | +"DNS caches." |
139 | +msgstr "" |
140 | +"Behin resolvconf instalaturik dagoela, interfaze konfigurazioak emango dizkio " |
141 | +"izen zerbitzariaren argibideak (honek C liburutegi ebazte eta DNS cache-ei " |
142 | +"eskurgarri egingo die). Hau bakarrik interfazeak altxatzean egingo dute. Hala ere " |
143 | +"resolvconf-ren izen zerbitzari argibideak instalatu ondoren behar bezala egoteko " |
144 | +"beharrezkoa da interfazeak birkonfiguratzea (hau da, interfazeak desgaitu eta " |
145 | +"berriz gaitzea) eta DNS cache-ak berrabiaraztea." |
146 | + |
147 | +#. Type: boolean |
148 | +#. Description |
149 | +#: ../templates:4001 |
150 | +msgid "Append original file to dynamic file?" |
151 | +msgstr "Erantsi jatorrizko fitxategia fitxategi dinamikora?" |
152 | + |
153 | +#. Type: boolean |
154 | +#. Description |
155 | +#: ../templates:4001 |
156 | +msgid "" |
157 | +"If the original static resolver configuration file (/etc/resolv.conf) " |
158 | +"contains name server addresses, those addresses should be listed on \"dns-" |
159 | +"nameservers\" lines in /etc/network/interfaces. For more information, please " |
160 | +"consult the resolvconf(8) man page and the README file." |
161 | +msgstr "" |
162 | +"Jatorrizko ebazpen 'finko' konfigurazio fitxategiak (etc/resolv.conf) izen " |
163 | +"zerbitzariak baditu, helbide horiek /etc/network/interfaces fitxategiko " |
164 | +"\"dns-nameservers\" lerroetan gehitu beharko dira. Argibide gehiagorako " |
165 | +"irakurri itzazu resolvconf(8) manual orrialdea eta README fitxategia." |
166 | + |
167 | +#. Type: boolean |
168 | +#. Description |
169 | +#: ../templates:4001 |
170 | +msgid "" |
171 | +"Until /etc/network/interfaces has been edited and the affected interfaces " |
172 | +"brought down and up again, the name server addresses will not be included in " |
173 | +"the dynamically generated resolver configuration file." |
174 | +msgstr "" |
175 | +"Behin /etc/network/interfaces editatua izan denean eta dagozkion interfazeak " |
176 | +"desgaitu eta gaitu arte izen zerbitzari helbideak ez dira gehituko dinamikoki " |
177 | +"sortutako ebazte konfigurazio fitxategian." |
178 | + |
179 | +#. Type: boolean |
180 | +#. Description |
181 | +#: ../templates:4001 |
182 | +msgid "" |
183 | +"If you choose this option, a temporary workaround will be put in place: a " |
184 | +"symbolic link will be created (if it does not already exist) from /etc/" |
185 | +"resolvconf/resolv.conf.d/tail to /etc/resolvconf/resolv.conf.d/original. " |
186 | +"This will cause the whole of that original resolver configuration file to be " |
187 | +"appended to the dynamically generated file." |
188 | +msgstr "" |
189 | +"Aukera hau hautatzen baduzu aldiroko portamolde bat erabiliko da, lotura " |
190 | +"sinboliko bat sortuko da (dagoeneko ez badago) /etc/resolvconf/" |
191 | +"resolv.conf.d/tail eta /etc/resolvconf/resolv.conf.d/original artean. Honela " |
192 | +"jatorrizko ebazte konfigurazio fitxategia dinamikoki sortutakoari erantsiko " |
193 | +"zaio." |
194 | + |
195 | +#. Type: boolean |
196 | +#. Description |
197 | +#: ../templates:4001 |
198 | +msgid "" |
199 | +"After the required \"dns-nameservers\" lines have been added to /etc/network/" |
200 | +"interfaces, the /etc/resolvconf/resolv.conf.d/tail link should be replaced " |
201 | +"by one to /dev/null." |
202 | +msgstr "" |
203 | +"Behin beharrezko \"dns-nameservers\" lerroak /etc/network/interfaces " |
204 | +"fitxategira gehitu direnean, /etc/resolvconf/resolv.conf.d/tail lotura " |
205 | +"/dev/null-erako batez ordeztu beharko zen." |
206 | + |
207 | |
208 | === modified file 'debian/postinst' |
209 | --- debian/postinst 2008-08-20 02:32:47 +0000 |
210 | +++ debian/postinst 2009-12-30 21:24:14 +0000 |
211 | @@ -32,19 +32,19 @@ |
212 | rm -f /etc/resolvconf/run |
213 | elif \ |
214 | [ "$RUN_CANONICALPATH" = "/dev/shm/resolvconf" ] \ |
215 | - && [ -d /lib/init/rw ] \ |
216 | - && [ -w /lib/init/rw ] \ |
217 | + && [ -d /var/run ] \ |
218 | + && [ -w /var/run ] \ |
219 | && [ -r /proc/mounts ] \ |
220 | - && grep -qs "^tmpfs[[:space:]]\+/lib/init/rw[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ |
221 | - && { [ -d /lib/init/rw/resolvconf ] || mkdir -v /lib/init/rw/resolvconf ; } \ |
222 | - && { [ -d /lib/init/rw/resolvconf/interface ] || mkdir -v /lib/init/rw/resolvconf/interface ; } \ |
223 | + && grep -qs "^none[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ |
224 | + && { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \ |
225 | + && { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; } \ |
226 | && F="$(echo /dev/shm/resolvconf/*)" \ |
227 | && [ "$F" ] \ |
228 | && [ "$F" != '/dev/shm/resolvconf/*' ] \ |
229 | - && cp -a /dev/shm/resolvconf/* /lib/init/rw/resolvconf |
230 | + && cp -a /dev/shm/resolvconf/* /var/run/resolvconf |
231 | then |
232 | - report_info "Migrating run-time database from /dev/shm/resolvconf to /lib/init/rw/resolvconf" |
233 | - ln -nsf /lib/init/rw/resolvconf /etc/resolvconf/run |
234 | + report_info "Migrating run-time database from /dev/shm/resolvconf to /var/run/resolvconf" |
235 | + ln -nsf /var/run/resolvconf /etc/resolvconf/run |
236 | fi |
237 | fi |
238 | # Delete it if it isn't a directory or a link to one |
239 | @@ -64,12 +64,12 @@ |
240 | # It's a dangling but canonicalizable symlink |
241 | mkdir -v "$RUN_CANONICALPATH" "${RUN_CANONICALPATH}/interface" |
242 | else |
243 | - # It's a nonexistent |
244 | + # It's nonexistent |
245 | # Use /var/run. |
246 | if \ |
247 | [ -d /var/run ] \ |
248 | && [ -w /var/run ] \ |
249 | - && grep -qs "^tmpfs[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ |
250 | + && grep -qs "^none[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ |
251 | && { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \ |
252 | && { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; } |
253 | then |
254 | |
255 | === modified file 'debian/postrm' |
256 | --- debian/postrm 2009-06-02 18:02:23 +0000 |
257 | +++ debian/postrm 2009-12-30 21:24:14 +0000 |
258 | @@ -31,8 +31,9 @@ |
259 | rm -f /etc/resolvconf/resolv.conf.d/tail |
260 | rm -f /etc/resolvconf/resolv.conf.d/original |
261 | rm -f /etc/default/resolvconf |
262 | - rmdir /lib/init/rw/resolvconf/interface || : |
263 | - rmdir /lib/init/rw/resolvconf || : |
264 | + rm -f /var/run/resolvconf/interface/* |
265 | + rmdir /var/run/resolvconf/interface || : |
266 | + rmdir /var/run/resolvconf || : |
267 | ;; |
268 | esac |
269 | |
270 | |
271 | === modified file 'man/resolvconf.8' |
272 | --- man/resolvconf.8 2008-12-07 15:12:34 +0000 |
273 | +++ man/resolvconf.8 2009-12-30 21:24:14 +0000 |
274 | @@ -234,6 +234,13 @@ |
275 | .I /etc/resolvconf/resolv.conf.d/tail |
276 | File to be appended to the dynamically generated resolver configuration file. |
277 | To append nothing, make this an empty file. |
278 | +This file is a good place to put a resolver |
279 | +.B options |
280 | +line if one is needed, e.g., |
281 | + |
282 | +.EX |
283 | + options inet6 |
284 | +.EE |
285 | .SH BUGS |
286 | Currently |
287 | .B resolvconf |