Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Services that start as root should start in / #3707

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Services that start as root should start in / #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de21d64
Services that start as root should start in /
citrus-it Oct 2, 2024
d23d3d8
Add tidy-manifests tool
citrus-it Oct 2, 2024
19ab63e
Reformat SMF manifests consistently
citrus-it Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/chrony/files/chrony.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
type="path">
<service_fmri value="file://localhost/etc/inet/chrony.conf" />
</dependency>

<!-- ntpsec/vmtoolsd also adjust the system time. Prevent chrony running
at the same time. -->

Expand All @@ -77,7 +76,8 @@
name="start"
exec="/usr/sbin/chronyd"
timeout_seconds="60">
<method_context security_flags="aslr">
<method_context security_flags="aslr"
working_directory="/">
<method_credential user="root"
group="root"
privileges="basic,!file_link_any,!proc_info,!proc_session,file_chown_self,file_dac_search,file_dac_write,net_privaddr,proc_lock_memory,proc_priocntl,proc_setid,sys_time" />
Expand Down
121 changes: 58 additions & 63 deletions build/dbus/files/dbus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
Copyright 2010 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
Copyright 2010 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.

CDDL HEADER START

Expand All @@ -24,69 +24,64 @@

CDDL HEADER END

ident "@(#)dbus.xml 1.1 06/04/24 SMI"
ident "@(#)dbus.xml 1.1 06/04/24 SMI"

NOTE: This service manifest is not editable; its contents will
be overwritten by package or patch operations, including
operating system upgrade. Make customizations in a different
file.
NOTE: This service manifest is not editable; its contents will
be overwritten by package or patch operations, including
operating system upgrade. Make customizations in a different
file.

Service manifest for dbus.
Service manifest for dbus.
-->

<service_bundle type='manifest' name='SUNWdbusr:dbus'>

<service
name='system/dbus'
type='service'
version='1'>

<create_default_instance enabled='true' />

<single_instance />

<dependency name='usr'
type='service'
grouping='require_all'
restart_on='none'>
<service_fmri value='svc:/system/filesystem/minimal' />
</dependency>

<exec_method
type='method'
name='start'
exec='/lib/svc/method/svc-dbus start'
timeout_seconds='30'>
<method_context>
<method_credential user='root' group='root' />
</method_context>
</exec_method>

<exec_method
type='method'
name='stop'
exec=':kill'
timeout_seconds='30' />

<property_group name='startd' type='framework'>
<!-- sub-process core dumps shouldn't restart session -->
<propval name='ignore_error' type='astring'
value='core,signal' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>
D-BUS message bus
</loctext>
</common_name>
<documentation>
<manpage title='dbus-daemon' section='1' manpath='/usr/man' />
</documentation>
</template>

</service>
<service_bundle type="manifest"
name="SUNWdbusr:dbus">

<service name="system/dbus"
type="service"
version="1">

<create_default_instance enabled="true" />

<single_instance />

<dependency name="usr"
type="service"
grouping="require_all"
restart_on="none">
<service_fmri value="svc:/system/filesystem/minimal" />
</dependency>

<exec_method type="method"
name="start"
exec="/lib/svc/method/svc-dbus start"
timeout_seconds="30"></exec_method>

<exec_method type="method"
name="stop"
exec=":kill"
timeout_seconds="30" />

<property_group name="startd"
type="framework">
<!-- sub-process core dumps should not restart session -->
<propval name="ignore_error"
type="astring"
value="core,signal" />
</property_group>

<stability value="Unstable" />

<template>
<common_name>
<loctext xml:lang="C">D-BUS message bus</loctext>
</common_name>
<documentation>
<manpage title="dbus-daemon"
section="1"
manpath="/usr/man" />
</documentation>
</template>

</service>

</service_bundle>
156 changes: 76 additions & 80 deletions build/ipmitool/files/ipmievd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,91 +19,87 @@ information: Portions Copyright [yyyy] [name of copyright owner]

CDDL HEADER END
-->

<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
Copyright 2007 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.

ident "@(#)ipmievd.xml 1.1 07/01/11 SMI"
ident "@(#)ipmievd.xml 1.1 07/01/11 SMI"
-->

<service_bundle type='manifest' name='SUNWipmi:ipmievd'>

<service name='network/ipmievd' type='service' version='1'>

<!--
Configure a default instance for the service since it doesn't
require additional configuration intervention before it starts.
-->
<create_default_instance enabled='false' />

<!--
Wait for all usr filesystem to be mounted. ipmievd is
located in /usr/lib.
-->
<dependency
name='filesystem-usr'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri
value='svc:/system/filesystem/usr:default'/>
</dependency>

<!--
Wait for syslog to be started in order to write system
messages from the kernel.
-->
<dependency
name='syslog'
grouping='require_all'
restart_on='none'
type='service'>
<service_fmri
value='svc:/system/system-log'/>
</dependency>

<!--
The ipmievd start/stop methods.
-->

<exec_method
type='method'
name='start'
exec='/lib/svc/method/svc-ipmievd %m'
timeout_seconds='60'/>

<exec_method
type='method'
name='stop'
exec=':kill'
timeout_seconds='60' />

<property_group name='startd' type='framework'>
<!--
Sub-process core dumps and external kill signals are not
considered errors, so the service should be restarted.
-->
<propval name='ignore_error' type='astring'
value='core,signal' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>
IPMI event daemon
</loctext>
</common_name>
<documentation>
<manpage title='ipmievd' section='8'
manpath='/usr/share/man' />
<doc_link name='sourceforge.net'
uri='http://sourceforge.net/projects/ipmitool' />
</documentation>
</template>
</service>
<service_bundle type="manifest"
name="SUNWipmi:ipmievd">

<service name="network/ipmievd"
type="service"
version="1">
<!--
Configure a default instance for the service since it does not
require additional configuration intervention before it starts.
-->

<create_default_instance enabled="false" />
<!--
Wait for all usr filesystem to be mounted. ipmievd is
located in /usr/lib.
-->

<dependency name="filesystem-usr"
grouping="require_all"
restart_on="none"
type="service">
<service_fmri value="svc:/system/filesystem/usr:default" />
</dependency>
<!--
Wait for syslog to be started in order to write system
messages from the kernel.
-->

<dependency name="syslog"
grouping="require_all"
restart_on="none"
type="service">
<service_fmri value="svc:/system/system-log" />
</dependency>
<!--
The ipmievd start/stop methods.
-->

<exec_method type="method"
name="start"
exec="/lib/svc/method/svc-ipmievd %m"
timeout_seconds="60" />

<exec_method type="method"
name="stop"
exec=":kill"
timeout_seconds="60" />

<property_group name="startd"
type="framework">
<!--
Sub-process core dumps and external kill signals are not
considered errors, so the service should be restarted.
-->
<propval name="ignore_error"
type="astring"
value="core,signal" />
</property_group>

<stability value="Unstable" />

<template>
<common_name>
<loctext xml:lang="C">IPMI event daemon</loctext>
</common_name>
<documentation>
<manpage title="ipmievd"
section="8"
manpath="/usr/share/man" />
<doc_link name="sourceforge.net"
uri="http://sourceforge.net/projects/ipmitool" />
</documentation>
</template>

</service>

</service_bundle>
Loading
Loading