Changeset 14482 for trunk/base

Timestamp:

Oct 8, 2005, 7:21:02 PM (19 years ago)

Author:

jberry

Message:

• Be more aggressive about creating launchd plists as root:wheel.
• Declare UI_PREFIX before using it.

File:

• trunk/base/src/port1.0/portstartupitem.tcl (modified) (6 diffs)

trunk/base/src/port1.0/portstartupitem.tcl

@@ -2 +2 @@
 # portstartupitem.tcl
 #
-# $Id: portstartupitem.tcl,v 1.16 2005/10/08 19:01:54 jberry Exp $
+# $Id: portstartupitem.tcl,v 1.17 2005/10/08 19:21:02 jberry Exp $
 #
 # Copyright (c) 2004, 2005 Markus W. Weissman <mww@opendarwin.org>,
@@ -117 +117 @@
 
 proc startupitem_create_darwin_systemstarter {args} {
-        global prefix destroot destroot.keepdirs  portname os.platform
+        global UI_PREFIX prefix destroot destroot.keepdirs  portname os.platform
         global startupitem.name startupitem.requires startupitem.init
         global startupitem.start startupitem.stop startupitem.restart startupitem.executable
@@ -371 +371 @@
 
 proc startupitem_create_darwin_launchd {args} {
-        global prefix destroot destroot.keepdirs portname os.platform
+        global UI_PREFIX prefix destroot destroot.keepdirs portname os.platform
         global startupitem.name startupitem.requires startupitem.init
         global startupitem.start startupitem.stop startupitem.restart startupitem.executable
@@ -388 +388 @@
         
         file mkdir ${destroot}${itemdir}
+        file attributes ${destroot}${itemdir} -owner root -group wheel
                 
         if { [llength ${startupitem.executable}] && 
@@ -425 +426 @@
                 # Create the wrapper script
                 set item [open "${destroot}${wrapper}" w 0755]
+                file attributes "${destroot}${wrapper}" -owner root -group wheel
 
                 puts ${item} "#!/bin/sh"
@@ -510 +512 @@
                 }
 
-                if { ${pidfileArgCnt} != 2 } {
+                if { ${pidfileArgCnt} > 2 } {
                         ui_error "$UI_PREFIX [msgcat::mc "Invalid parameter count to startupitem.pidfile: 2 expected, %d found" ${pidfileArgCnt}]"
                 }