1 --- init/cups.xml.in.orig Fri Oct 2 22:41:34 2009 |
1 --- init/cups.xml.in.orig Thu Jul 8 22:54:14 2010 |
2 +++ init/cups.xml.in Fri Oct 2 22:42:36 2009 |
2 +++ init/cups.xml.in Tue Aug 16 14:51:37 2011 |
3 @@ -60,6 +60,14 @@ |
3 @@ -52,14 +52,6 @@ |
4 <service_fmri value='svc:/application/print/server' /> |
4 <service_fmri value='svc:/milestone/network' /> |
5 </dependency> |
5 </dependency> |
6 |
6 |
7 + <dependency |
7 - <dependency |
8 + name='ipp-listener' |
8 - name='lpsched' |
9 + grouping='exclude_all' |
9 - grouping='exclude_all' |
10 + restart_on='none' |
10 - restart_on='none' |
11 + type='service'> |
11 - type='service'> |
12 + <service_fmri value='svc:/application/print/ipp-listener' /> |
12 - <service_fmri value='svc:/application/print/server' /> |
13 + </dependency> |
13 - </dependency> |
14 + |
14 - |
15 <exec_method |
15 <exec_method |
16 type='method' |
16 type='method' |
17 name='stop' |
17 name='stop' |
18 @@ -90,7 +98,7 @@ |
18 @@ -66,7 +58,7 @@ |
|
19 exec=':kill' |
|
20 timeout_seconds='60' /> |
|
21 |
|
22 - <instance name='default' enabled='false' > |
|
23 + <instance name='default' enabled='true' > |
|
24 |
|
25 <dependency |
|
26 name='config_data' |
|
27 @@ -87,10 +79,12 @@ |
|
28 </exec_method> |
|
29 |
|
30 <property_group name='general' type='framework'> |
|
31 + <propval name='active' type='boolean' |
|
32 + value='true' /> |
19 <propval name='action_authorization' type='astring' |
33 <propval name='action_authorization' type='astring' |
20 value='solaris.smf.manage.cups' /> |
34 value='solaris.smf.manage.cups' /> |
21 <propval name='value_authorization' type='astring' |
35 <propval name='value_authorization' type='astring' |
22 - value='solaris.smf.value.cups' /> |
36 - value='solaris.smf.value.cups' /> |
23 + value='solaris.smf.manage.cups' /> |
37 + value='solaris.smf.manage.cups' /> |
24 </property_group> |
38 </property_group> |
25 |
39 |
26 <template> |
40 <template> |
27 @@ -190,7 +198,7 @@ |
41 @@ -144,14 +138,6 @@ |
|
42 <service_fmri value='svc:/milestone/network' /> |
|
43 </dependency> |
|
44 |
|
45 - <dependency |
|
46 - name='in-lpd' |
|
47 - grouping='exclude_all' |
|
48 - restart_on='none' |
|
49 - type='service'> |
|
50 - <service_fmri value='svc:/application/print/rfc1179' /> |
|
51 - </dependency> |
|
52 - |
|
53 <exec_method |
|
54 type='method' |
|
55 name='stop' |
|
56 @@ -158,7 +144,7 @@ |
|
57 exec=':kill' |
|
58 timeout_seconds='60' /> |
|
59 |
|
60 - <instance name='default' enabled='false' > |
|
61 + <instance name='default' enabled='true' > |
|
62 <dependency |
|
63 name='cupsd' |
|
64 grouping='require_all' |
|
65 @@ -190,7 +176,7 @@ |
28 <propval name='action_authorization' type='astring' |
66 <propval name='action_authorization' type='astring' |
29 value='solaris.smf.manage.cups' /> |
67 value='solaris.smf.manage.cups' /> |
30 <propval name='value_authorization' type='astring' |
68 <propval name='value_authorization' type='astring' |
31 - value='solaris.smf.value.cups' /> |
69 - value='solaris.smf.value.cups' /> |
32 + value='solaris.smf.manage.cups' /> |
70 + value='solaris.smf.manage.cups' /> |