Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/cups/patches/02-smf.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 481 9ca5b97b5b08
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
481
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     1
 
--- init/cups.xml.in.orig	Thu Jul  8 22:54:14 2010
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     2
 
+++ init/cups.xml.in	Tue Aug 16 14:51:37 2011
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     3
 
@@ -52,14 +52,6 @@
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     4
 
         <service_fmri value='svc:/milestone/network' />
220
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     5
 
     </dependency>
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     6
481
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     7
 
-    <dependency
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     8
 
-        name='lpsched'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
     9
 
-        grouping='exclude_all'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    10
 
-        restart_on='none'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    11
 
-        type='service'>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    12
 
-        <service_fmri value='svc:/application/print/server' />
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    13
 
-    </dependency>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    14
 
-
220
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    15
 
     <exec_method
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    16
 
         type='method'
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    17
 
         name='stop'
481
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    18
 
@@ -66,7 +58,7 @@
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    19
 
         exec=':kill'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    20
 
         timeout_seconds='60' />
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    21
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    22
 
-    <instance name='default' enabled='false' >
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    23
 
+    <instance name='default' enabled='true' >
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    24
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    25
 
         <dependency
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    26
 
             name='config_data'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    27
 
@@ -87,10 +79,12 @@
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    28
 
         </exec_method>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    29
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    30
 
         <property_group name='general' type='framework'>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    31
 
+            <propval name='active' type='boolean'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    32
 
+                value='true' />
220
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    33
 
             <propval name='action_authorization' type='astring'
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    34
 
                 value='solaris.smf.manage.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    35
 
             <propval name='value_authorization' type='astring'
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    36
 
-                value='solaris.smf.value.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    37
 
+                value='solaris.smf.manage.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    38
 
         </property_group>
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    39
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    40
 
         <template>
481
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    41
 
@@ -144,14 +138,6 @@
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    42
 
         <service_fmri value='svc:/milestone/network' />
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    43
 
     </dependency>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    44
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    45
 
-    <dependency
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    46
 
-        name='in-lpd'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    47
 
-        grouping='exclude_all'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    48
 
-        restart_on='none'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    49
 
-        type='service'>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    50
 
-        <service_fmri value='svc:/application/print/rfc1179' />
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    51
 
-    </dependency>
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    52
 
-
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    53
 
     <exec_method
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    54
 
         type='method'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    55
 
         name='stop'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    56
 
@@ -158,7 +144,7 @@
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    57
 
         exec=':kill'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    58
 
         timeout_seconds='60' />
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    59
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    60
 
-    <instance name='default' enabled='false' >
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    61
 
+    <instance name='default' enabled='true' >
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    62
 
         <dependency
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    63
 
             name='cupsd'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    64
 
             grouping='require_all'
9ca5b97b5b08 PSARC/2011/084 LP print service EOF
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents: 220
diff changeset 
    65
 
@@ -190,7 +176,7 @@
220
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    66
 
             <propval name='action_authorization' type='astring'
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    67
 
                 value='solaris.smf.manage.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    68
 
             <propval name='value_authorization' type='astring'
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    69
 
-                value='solaris.smf.value.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    70
 
+                value='solaris.smf.manage.cups' />
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    71
 
         </property_group>
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    72
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    73
 
         <template>
upstream/oracle/userland-gate