Ubuntu
likewise-open package

Merge lp:~ssalley/ubuntu/natty/likewise-open/likewise-open-fix-752910 into lp:ubuntu/natty/likewise-open

  1. Natty (11.04)
  2. likewise-open-fix-752910
  3. Merge into natty
Proposed by Scott Salley
Status: Merged
Merged at revision: 27
Proposed branch: lp:~ssalley/ubuntu/natty/likewise-open/likewise-open-fix-752910
Merge into: lp:ubuntu/natty/likewise-open
Diff against target: 493 lines (+92/-57)
3 files modified
debian/changelog (+13/-0)
debian/likewise-open.preinst (+22/-0)
debian/patches/add-missing-lwconfig.diff (+57/-57)
To merge this branch: bzr merge lp:~ssalley/ubuntu/natty/likewise-open/likewise-open-fix-752910
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+56671@code.launchpad.net

Description of the change

Corrected paths in the file /var/lib/likewise-open/lwconfig.xml (a result of debian/patches/add-missing-lwconfig.diff) that reference likewise-open binaries. The upstream package is generally installed in /opt and the paths were referencing this location.

Test by running 'sudo lwconfig LoginShellTemplate /bin/sh' after joining a domain. No errors should be reported.

To post a comment you must log in.

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 2011-03-21 19:28:39 +0000
3+++ debian/changelog 2011-04-06 23:13:25 +0000
4@@ -1,3 +1,16 @@
5+likewise-open (6.0.0.53010-4ubuntu5) natty; urgency=low
6+
7+ * modified debian/patches/add-missing-lwconfig.diff to correct the paths in
8+ file /var/lib/likewise-open/lwconfig.xml (LP: #752910)
9+
10+ -- Scott Salley <ssalley@likewise.com> Wed, 6 Apr 2011 14:29:02 -0800
11+
12+likewise-open (6.0.0.53010-4ubuntu4) natty; urgency=low
13+
14+ * debian/likewise-open.preinst now stops daemons during upgrade (LP: #751807)
15+
16+ -- Scott Salley <ssalley@likewise.com> Tue, 5 Apr 2011 13:52:58 -0800
17+
18 likewise-open (6.0.0.53010-4ubuntu3) natty; urgency=low
19
20 * remove stale pid files during installation and daemon exit. (LP: #737362)
21
22=== modified file 'debian/likewise-open.preinst'
23--- debian/likewise-open.preinst 2011-03-21 19:28:39 +0000
24+++ debian/likewise-open.preinst 2011-04-06 23:13:25 +0000
25@@ -190,6 +190,28 @@
26 # from 5.0
27 rm_conffile /etc/init.d/npcmuxd
28 fi
29+
30+ if dpkg --compare-versions "$2" lt-nl "6.0.0"; then
31+ # Shutdown old daemons nicely
32+ if [ -f /etc/init.d/lsassd ]
33+ then
34+ exec_log "/etc/init.d/lsassd stop"
35+ fi
36+
37+ for daemon in $DAEMONS_TO_HALT
38+ do
39+ if [ -x /etc/init.d/$daemon ]; then
40+ exec_logfile "/etc/init.d/$daemon stop"
41+ fi
42+ exec_logfile "pkill -TERM -x $daemon"
43+ exec_logfile "pkill -KILL -x $daemon"
44+ exec_logfile "rm -f /var/run/$daemon.pid"
45+ done
46+
47+ logfile "Snapshot of processes after stopping daemons"
48+ exec_logfile "ps ax"
49+
50+ fi
51 return 0
52 ;;
53
54
55=== modified file 'debian/patches/add-missing-lwconfig.diff'
56--- debian/patches/add-missing-lwconfig.diff 2011-03-04 23:09:36 +0000
57+++ debian/patches/add-missing-lwconfig.diff 2011-04-06 23:13:25 +0000
58@@ -642,7 +642,7 @@
59 +
60 + <description>A list of user names, group names, or SIDS separated by commas.</description>
61 + <default><value></value></default>
62-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
63++ <apply command="/usr/bin/lwsm restart eventlog" />
64 + </registry>
65 + </capability>
66 +
67@@ -656,7 +656,7 @@
68 + <default>
69 + <value></value>
70 + </default>
71-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
72++ <apply command="/usr/bin/lwsm restart eventlog" />
73 + </registry>
74 + </capability>
75 +
76@@ -670,7 +670,7 @@
77 + <default>
78 + <value></value>
79 + </default>
80-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
81++ <apply command="/usr/bin/lwsm restart eventlog" />
82 + </registry>
83 + </capability>
84 + <capability>
85@@ -689,7 +689,7 @@
86 + <unit suffix="B" multiplier="1" />
87 + <unit suffix="KB" multiplier="1024" />
88 + <unit suffix="MB" multiplier="1048576" />
89-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
90++ <apply command="/usr/bin/lwsm restart eventlog" />
91 + </registry>
92 + </capability>
93 + <capability>
94@@ -705,7 +705,7 @@
95 + <accept>
96 + <range min="1" max="365" />
97 + </accept>
98-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
99++ <apply command="/usr/bin/lwsm restart eventlog" />
100 + </registry>
101 + </capability>
102 + <capability>
103@@ -721,7 +721,7 @@
104 + <accept>
105 + <range min="100" max="2000000" />
106 + </accept>
107-+ <apply command="/opt/likewise/bin/lwsm restart eventlog" />
108++ <apply command="/usr/bin/lwsm restart eventlog" />
109 + </registry>
110 + </capability>
111 + </section>
112@@ -740,8 +740,8 @@
113 + <pattern>..+</pattern>
114 + <pattern>[a-zA-Z0-9]</pattern>
115 + </reject>
116-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
117-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
118++ <apply command="/usr/bin/lwsm refresh lsass" />
119++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
120 + </registry>
121 + </capability>
122 + <capability>
123@@ -758,8 +758,8 @@
124 + <pattern>..+</pattern>
125 + <pattern>[a-zA-Z0-9]</pattern>
126 + </reject>
127-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
128-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
129++ <apply command="/usr/bin/lwsm refresh lsass" />
130++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
131 + </registry>
132 + </capability>
133 + <capability>
134@@ -771,7 +771,7 @@
135 + <default>
136 + <value>false</value>
137 + </default>
138-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
139++ <apply command="/usr/bin/lwsm refresh lsass" />
140 + </registry>
141 + </capability>
142 + <capability>
143@@ -783,7 +783,7 @@
144 + <default>
145 + <value>false</value>
146 + </default>
147-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
148++ <apply command="/usr/bin/lwsm refresh lsass" />
149 + </registry>
150 + </capability>
151 +</section>
152@@ -797,7 +797,7 @@
153 + <default>
154 + <value>false</value>
155 + </default>
156-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
157++ <apply command="/usr/bin/lwsm refresh lsass" />
158 + </registry>
159 + </capability>
160 + <capability>
161@@ -816,7 +816,7 @@
162 + <value>info</value>
163 + <value>verbose</value>
164 + </accept>
165-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
166++ <apply command="/usr/bin/lwsm refresh lsass" />
167 + </registry>
168 + </capability>
169 + <capability>
170@@ -829,7 +829,7 @@
171 + <default>
172 + <value>Access Denied</value>
173 + </default>
174-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
175++ <apply command="/usr/bin/lwsm refresh lsass" />
176 + </registry>
177 + </capability>
178 +</section>
179@@ -843,8 +843,8 @@
180 + <default>
181 + <value>false</value>
182 + </default>
183-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
184-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
185++ <apply command="/usr/bin/lwsm refresh lsass" />
186++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
187 + </registry>
188 + </capability>
189 + <capability>
190@@ -856,7 +856,7 @@
191 + <default>
192 + <value>true</value>
193 + </default>
194-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
195++ <apply command="/usr/bin/lwsm refresh lsass" />
196 + </registry>
197 + </capability>
198 + <capability>
199@@ -868,7 +868,7 @@
200 + <default>
201 + <value>true</value>
202 + </default>
203-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
204++ <apply command="/usr/bin/lwsm refresh lsass" />
205 + </registry>
206 + </capability>
207 + <capability>
208@@ -880,7 +880,7 @@
209 + <default>
210 + <value>true</value>
211 + </default>
212-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
213++ <apply command="/usr/bin/lwsm refresh lsass" />
214 + </registry>
215 + </capability>
216 + <capability>
217@@ -892,7 +892,7 @@
218 + <default>
219 + <value>true</value>
220 + </default>
221-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
222++ <apply command="/usr/bin/lwsm refresh lsass" />
223 + </registry>
224 + </capability>
225 + <capability>
226@@ -904,7 +904,7 @@
227 + <default>
228 + <value>false</value>
229 + </default>
230-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
231++ <apply command="/usr/bin/lwsm refresh lsass" />
232 + </registry>
233 + </capability>
234 + <capability>
235@@ -916,7 +916,7 @@
236 + <default>
237 + <value>true</value>
238 + </default>
239-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
240++ <apply command="/usr/bin/lwsm refresh lsass" />
241 + </registry>
242 + </capability>
243 + <capability>
244@@ -928,8 +928,8 @@
245 + <default>
246 + <value>@enable_nss_enum_default@</value>
247 + </default>
248-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
249-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
250++ <apply command="/usr/bin/lwsm refresh lsass" />
251++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
252 + </registry>
253 + </capability>
254 + <capability>
255@@ -941,8 +941,8 @@
256 + <default>
257 + <value>true</value>
258 + </default>
259-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
260-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
261++ <apply command="/usr/bin/lwsm refresh lsass" />
262++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
263 + </registry>
264 + </capability>
265 + <capability>
266@@ -954,8 +954,8 @@
267 + <default>
268 + <value>false</value>
269 + </default>
270-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
271-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
272++ <apply command="/usr/bin/lwsm refresh lsass" />
273++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
274 + </registry>
275 + </capability>
276 + <capability>
277@@ -967,7 +967,7 @@
278 + <default>
279 + <value>true</value>
280 + </default>
281-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
282++ <apply command="/usr/bin/lwsm refresh lsass" />
283 + </registry>
284 + </capability>
285 + <capability>
286@@ -987,7 +987,7 @@
287 + <unit suffix="m" multiplier="60" />
288 + <unit suffix="h" multiplier="3600" />
289 + <unit suffix="d" multiplier="86400" />
290-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
291++ <apply command="/usr/bin/lwsm refresh lsass" />
292 + </registry>
293 + </capability>
294 + <capability>
295@@ -999,7 +999,7 @@
296 + <default>
297 + <value>false</value>
298 + </default>
299-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
300++ <apply command="/usr/bin/lwsm refresh lsass" />
301 + </registry>
302 + </capability>
303 + <capability>
304@@ -1019,7 +1019,7 @@
305 + <unit suffix="m" multiplier="60" />
306 + <unit suffix="h" multiplier="3600" />
307 + <unit suffix="d" multiplier="86400" />
308-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
309++ <apply command="/usr/bin/lwsm refresh lsass" />
310 + </registry>
311 + </capability>
312 + <capability>
313@@ -1039,7 +1039,7 @@
314 + <unit suffix="m" multiplier="60" />
315 + <unit suffix="h" multiplier="3600" />
316 + <unit suffix="d" multiplier="86400" />
317-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
318++ <apply command="/usr/bin/lwsm refresh lsass" />
319 + </registry>
320 + </capability>
321 + <capability>
322@@ -1059,7 +1059,7 @@
323 + <unit suffix="m" multiplier="60" />
324 + <unit suffix="h" multiplier="3600" />
325 + <unit suffix="d" multiplier="86400" />
326-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
327++ <apply command="/usr/bin/lwsm refresh lsass" />
328 + </registry>
329 + </capability>
330 + <capability>
331@@ -1082,7 +1082,7 @@
332 + <unit suffix="m" multiplier="60" />
333 + <unit suffix="h" multiplier="3600" />
334 + <unit suffix="d" multiplier="86400" />
335-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
336++ <apply command="/usr/bin/lwsm refresh lsass" />
337 + </registry>
338 + </capability>
339 + <capability>
340@@ -1098,7 +1098,7 @@
341 + <unit suffix="B" multiplier="1" />
342 + <unit suffix="KB" multiplier="1024" />
343 + <unit suffix="MB" multiplier="1048576" />
344-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
345++ <apply command="/usr/bin/lwsm refresh lsass" />
346 + </registry>
347 + </capability>
348 + <capability>
349@@ -1111,8 +1111,8 @@
350 + <default>
351 + <value>@default_homedir_prefix@</value>
352 + </default>
353-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
354-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
355++ <apply command="/usr/bin/lwsm refresh lsass" />
356++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
357 + </registry>
358 + </capability>
359 + <capability>
360@@ -1125,8 +1125,8 @@
361 + <default>
362 + <value>%H/local/%D/%U</value>
363 + </default>
364-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
365-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
366++ <apply command="/usr/bin/lwsm refresh lsass" />
367++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
368 + </registry>
369 + </capability>
370 + <capability>
371@@ -1139,8 +1139,8 @@
372 + <default>
373 + <value>022</value>
374 + </default>
375-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
376-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
377++ <apply command="/usr/bin/lwsm refresh lsass" />
378++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
379 + </registry>
380 + </capability>
381 + <capability>
382@@ -1153,8 +1153,8 @@
383 + <default>
384 + <value>/bin/sh</value>
385 + </default>
386-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
387-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
388++ <apply command="/usr/bin/lwsm refresh lsass" />
389++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
390 + </registry>
391 + </capability>
392 + <capability>
393@@ -1167,7 +1167,7 @@
394 + <default>
395 + <value>@default_skeldirs@</value>
396 + </default>
397-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
398++ <apply command="/usr/bin/lwsm refresh lsass" />
399 + </registry>
400 + </capability>
401 + <capability>
402@@ -1181,8 +1181,8 @@
403 + <default>
404 + <value></value>
405 + </default>
406-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
407-+ <apply command="/opt/likewise/bin/lw-ad-cache --delete-all" />
408++ <apply command="/usr/bin/lwsm refresh lsass" />
409++ <apply command="/usr/bin/lw-ad-cache --delete-all" />
410 + </registry>
411 + </capability>
412 + <capability>
413@@ -1194,7 +1194,7 @@
414 + <default>
415 + <value>false</value>
416 + </default>
417-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
418++ <apply command="/usr/bin/lwsm refresh lsass" />
419 + </registry>
420 + </capability>
421 + <capability>
422@@ -1207,7 +1207,7 @@
423 + <default>
424 + <value></value>
425 + </default>
426-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
427++ <apply command="/usr/bin/lwsm refresh lsass" />
428 + </registry>
429 + </capability>
430 + <capability>
431@@ -1220,7 +1220,7 @@
432 + <default>
433 + <value></value>
434 + </default>
435-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
436++ <apply command="/usr/bin/lwsm refresh lsass" />
437 + </registry>
438 + </capability>
439 + <capability>
440@@ -1233,7 +1233,7 @@
441 + <default>
442 + <value></value>
443 + </default>
444-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
445++ <apply command="/usr/bin/lwsm refresh lsass" />
446 + </registry>
447 + </capability>
448 +</section>
449@@ -1247,7 +1247,7 @@
450 + <default>
451 + <value>true</value>
452 + </default>
453-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
454++ <apply command="/usr/bin/lwsm refresh lsass" />
455 + </registry>
456 + </capability>
457 + <capability>
458@@ -1260,7 +1260,7 @@
459 + <default>
460 + <value>%H/local/%D/%U</value>
461 + </default>
462-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
463++ <apply command="/usr/bin/lwsm refresh lsass" />
464 + </registry>
465 + </capability>
466 + <capability>
467@@ -1273,7 +1273,7 @@
468 + <default>
469 + <value>022</value>
470 + </default>
471-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
472++ <apply command="/usr/bin/lwsm refresh lsass" />
473 + </registry>
474 + </capability>
475 + <capability>
476@@ -1286,7 +1286,7 @@
477 + <default>
478 + <value>/bin/sh</value>
479 + </default>
480-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
481++ <apply command="/usr/bin/lwsm refresh lsass" />
482 + </registry>
483 + </capability>
484 + <capability>
485@@ -1299,7 +1299,7 @@
486 + <default>
487 + <value>@default_skeldirs@</value>
488 + </default>
489-+ <apply command="/opt/likewise/bin/lwsm refresh lsass" />
490++ <apply command="/usr/bin/lwsm refresh lsass" />
491 + </registry>
492 + </capability>
493 + </section>

Subscribers

People subscribed via source and target branches

to all changes: