mirror of
https://github.com/systemd/systemd.git
synced 2024-10-26 08:55:40 +03:00
Merge f89e4efe70
into ddb8a639d5
This commit is contained in:
commit
76963b2f93
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" >
|
||||
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
||||
|
||||
<refentry id="org.freedesktop.sysupdate1" conditional='ENABLE_SYSUPDATE'
|
||||
<refentry id="org.freedesktop.sysupdate1" conditional='ENABLE_SYSUPDATE ENABLE_SYSUPDATED'
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<refentryinfo>
|
||||
<title>org.freedesktop.sysupdate1</title>
|
||||
@ -27,6 +27,9 @@
|
||||
<citerefentry><refentrytitle>systemd-sysupdated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
is a system service that allows unprivileged clients to update the system. This page describes the D-Bus
|
||||
interface.</para>
|
||||
|
||||
<para><strong>WARNING!</strong> This API is currently <emphasis>unstable</emphasis> and is thus subject
|
||||
to breaking changes between versions of systemd.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
|
@ -341,7 +341,6 @@
|
||||
<para><simplelist type="inline">
|
||||
<member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>sysupdate.d</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>systemd-sysupdated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>systemd-repart</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
|
||||
</simplelist></para>
|
||||
</refsect1>
|
||||
|
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
||||
|
||||
<refentry id="systemd-sysupdated.service" conditional='ENABLE_SYSUPDATE'>
|
||||
<refentry id="systemd-sysupdated.service" conditional='ENABLE_SYSUPDATE ENABLE_SYSUPDATED'>
|
||||
|
||||
<refentryinfo>
|
||||
<title>systemd-sysupdated.service</title>
|
||||
|
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
||||
|
||||
<refentry id="updatectl" conditional='ENABLE_SYSUPDATE'
|
||||
<refentry id="updatectl" conditional='ENABLE_SYSUPDATE ENABLE_SYSUPDATED'
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
|
||||
<refentryinfo>
|
||||
|
19
meson.build
19
meson.build
@ -1608,6 +1608,25 @@ have = get_option('sysupdate').require(
|
||||
conf.get('HAVE_LIBFDISK') == 1,
|
||||
error_message : 'fdisk and openssl required').allowed()
|
||||
conf.set10('ENABLE_SYSUPDATE', have)
|
||||
if have
|
||||
sysupdate_mode = get_option('sysupdate-mode')
|
||||
if sysupdate_mode == 'default'
|
||||
if conf.get('BUILD_MODE_DEVELOPER') == 1
|
||||
sysupdate_mode = 'sysupdated'
|
||||
# TODO: Should the default be both? Packagers will need to split
|
||||
# out sub-packages by default then. Maybe default should
|
||||
# cause a build failure instead, so you _have_ to pick one?
|
||||
else
|
||||
sysupdate_mode = 'units'
|
||||
endif
|
||||
endif
|
||||
|
||||
conf.set10('ENABLE_SYSUPDATED', sysupdate_mode == 'sysupdated' or sysupdate_mode == 'both')
|
||||
conf.set10('ENABLE_SYSUPDATE_UNITS', sysupdate_mode == 'units' or sysupdate_mode == 'both')
|
||||
else
|
||||
conf.set10('ENABLE_SYSUPDATED', false)
|
||||
conf.set10('ENABLE_SYSUPDATE_UNITS', false)
|
||||
endif
|
||||
|
||||
conf.set10('ENABLE_STORAGETM', get_option('storagetm'))
|
||||
|
||||
|
@ -545,3 +545,7 @@ option('vmlinux-h-path', type : 'string', value : '',
|
||||
|
||||
option('default-mountfsd-trusted-directories', type : 'boolean', value: false,
|
||||
description : 'controls whether mountfsd should apply a relaxed policy on DDIs in system DDI directories')
|
||||
|
||||
option('sysupdate-mode', type: 'combo', value : 'default',
|
||||
choices : ['default', 'units', 'sysupdated', 'both'],
|
||||
description : 'whether to install systemd-sysupdated, plain unit files, or both (for packagers creating sub-packages)')
|
||||
|
@ -40,7 +40,7 @@ executables += [
|
||||
libexec_template + {
|
||||
'name' : 'systemd-sysupdated',
|
||||
'dbus' : true,
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATED'],
|
||||
'sources' : files('sysupdated.c'),
|
||||
'dependencies' : threads,
|
||||
},
|
||||
@ -48,11 +48,11 @@ executables += [
|
||||
'name' : 'updatectl',
|
||||
'public' : true,
|
||||
'sources' : systemd_updatectl_sources,
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATED'],
|
||||
},
|
||||
]
|
||||
|
||||
if conf.get('ENABLE_SYSUPDATE') == 1
|
||||
if conf.get('ENABLE_SYSUPDATE') == 1 and conf.get('ENABLE_SYSUPDATED') == 1
|
||||
install_data('org.freedesktop.sysupdate1.conf',
|
||||
install_dir : dbuspolicydir)
|
||||
install_data('org.freedesktop.sysupdate1.service',
|
||||
|
@ -630,24 +630,24 @@ units = [
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysupdate-reboot.service.in',
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATE_UNITS'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysupdate-reboot.timer',
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATE_UNITS'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysupdate.service.in',
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATE_UNITS'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysupdated.service.in',
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATED'],
|
||||
'symlinks' : ['dbus-org.freedesktop.sysupdate1.service'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysupdate.timer',
|
||||
'conditions' : ['ENABLE_SYSUPDATE'],
|
||||
'conditions' : ['ENABLE_SYSUPDATE', 'ENABLE_SYSUPDATE_UNITS'],
|
||||
},
|
||||
{
|
||||
'file' : 'systemd-sysusers.service',
|
||||
|
Loading…
Reference in New Issue
Block a user