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/17-smf-start-method.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 853 72b657a4e294
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
853
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
     1
 
--- init/cups.xml.in.orig	2012-06-04 00:33:19.967159134 -0700
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
     2
 
+++ init/cups.xml.in	2012-06-04 00:34:58.000000000 -0700
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
     3
 
@@ -71,8 +71,8 @@
810
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     4
 
         <exec_method
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     5
 
             type='method'
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     6
 
             name='start'
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     7
 
-            exec='@sbindir@/cupsd'
853
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
     8
 
-            timeout_seconds='60' >
810
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     9
 
+            exec='/lib/svc/method/svc-cupsd'
853
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
    10
 
+            timeout_seconds='300' >
810
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    11
 
             <method_context>
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    12
 
                 <method_credential user='root' group='@CUPS_GROUP@' />
853
72b657a4e294 7173189 application/cups/scheduler:default start fails to maintenance, Start method died on Killed
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents: 810
diff changeset 
    13
 
             </method_context>
810
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    14
 
@@ -87,6 +87,8 @@
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    15
 
                 value='solaris.smf.manage.cups' />
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    16
 
         </property_group>
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    17
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    18
 
+        <property_group name='startup' type='application' />
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    19
 
+
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    20
 
         <template>
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    21
 
             <common_name>
297dc5ace0d5 7156212 spooled files won't actually print after upgrade from build 10 to build 12
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    22
 
                 <loctext xml:lang='C'>
upstream/oracle/userland-gate