From d3fcecf3c93ea0484f119eba21fa84732a16fed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Aug 2020 12:24:32 +0200 Subject: [PATCH 1/4] man: import lxml formatting changes lxml insists on this, see 4fb222c4b29ec2a1a451a1e0e99c5d3c520395ab. --- man/org.freedesktop.LogControl1.xml | 6 +++--- man/org.freedesktop.home1.xml | 2 +- man/org.freedesktop.login1.xml | 2 +- man/org.freedesktop.machine1.xml | 2 +- man/org.freedesktop.systemd1.xml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/man/org.freedesktop.LogControl1.xml b/man/org.freedesktop.LogControl1.xml index d8ce392c87..5944061f99 100644 --- a/man/org.freedesktop.LogControl1.xml +++ b/man/org.freedesktop.LogControl1.xml @@ -75,7 +75,7 @@ node /org/freedesktop/LogControl1 { Properties LogLevel describes the - syslog3-style + syslog3-style log-level, and should be one of emerg, alert, crit, err, warning, notice, info, debug, in order of increasing verbosity. @@ -86,14 +86,14 @@ node /org/freedesktop/LogControl1 { journal (log to the journal natively, see systemd-journald.service8), syslog (log using the - syslog3 call). + syslog3 call). Those two properties are writable, so they may be set by sufficiently privileged users. SyslogIdentifier is a read-only property that shows the "syslog identifier". It is a short string that identifies the program that is the source of log messages that is passed to - the syslog3 call. + the syslog3 call. Note: journalctl option / may diff --git a/man/org.freedesktop.home1.xml b/man/org.freedesktop.home1.xml index 5cf1159703..73f8682480 100644 --- a/man/org.freedesktop.home1.xml +++ b/man/org.freedesktop.home1.xml @@ -165,7 +165,7 @@ node /org/freedesktop/home1 { GetHomeByName() returns basic user information (a minimal subset of the full user record), provided a user name. The information supplied more or less matches what - getpwnam3 returns: + getpwnam3 returns: the numeric UID and GID, the real name, home directory and shell. In addition it returns a state identifier describing the state the user's home directory is in, as well as a bus path referring to the bus object encapsulating the user record and home directory. This object implements the diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index 002abbb7e3..7e127ef18c 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -567,7 +567,7 @@ node /org/freedesktop/login1 { SetWallMessage() sets the wall message (the message that will be sent out to all terminals and stored in a - utmp5 record) for a + utmp5 record) for a subsequent scheduled shutdown operation. The parameter wall_message specifies the shutdown reason (and may be empty) which will be included in the shutdown message. The parameter enable specifies whether to print a wall message on shutdown. diff --git a/man/org.freedesktop.machine1.xml b/man/org.freedesktop.machine1.xml index a54fa040b2..da4738b615 100644 --- a/man/org.freedesktop.machine1.xml +++ b/man/org.freedesktop.machine1.xml @@ -368,7 +368,7 @@ node /org/freedesktop/machine1 { OpenMachinePTY() allocates a pseudo TTY in the container and returns a file descriptor and its path. This is equivalent to transitioning into the container and invoking - posix_openpt3. + posix_openpt3. OpenMachineLogin() allocates a pseudo TTY in the container and ensures that diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 8a7990ff7d..e9986335a3 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -8278,15 +8278,15 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { Most of the properties map directly to the corresponding settings in swap unit files. As mount units invoke the - swapon8 command, + swapon8 command, their bus objects include implicit ExecActivate (and similar) fields which contain information about processes to execute. They also share most of the fields related to the execution context that Service objects expose (see above). In addition to these properties there are the following: ControlPID contains the PID of the currently running - swapon8 or - swapoff8 + swapon8 or + swapoff8 command if there is one running, otherwise 0. Result contains a value explaining why a mount unit failed if it failed. It From 9653108f1135ad5105fbe71ccf6f818aeb7aa5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Aug 2020 12:25:44 +0200 Subject: [PATCH 2/4] man: update autogenerated dbus api lists We forgot to do this before the release :( Relavant commits are: 4e11ddfdd3c1f93721b8ca534e33e16ced32ff06, 0bb007f7a23c41e23481373ded47ee3ddcf8f26b, a3d19f5d99c44940831a33df8b5bece4aaf749f7, bf760801804e55b045aed54bf9b1d0b0131be3f2, 4793c31083031e729e6eb17b87b540a3944bba3b. Suitable for backporting. --- man/org.freedesktop.resolve1.xml | 39 ++++++++++++++++++++++++++++++++ man/org.freedesktop.systemd1.xml | 25 +++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index 96e22c6559..5b8acbbd9f 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -86,6 +86,8 @@ node /org/freedesktop/resolve1 { out o path); SetLinkDNS(in i ifindex, in a(iay) addresses); + SetLinkDNSEx(in i ifindex, + in a(iayqs) addresses); SetLinkDomains(in i ifindex, in a(sb) domains); SetLinkDefaultRoute(in i ifindex, @@ -122,9 +124,13 @@ node /org/freedesktop/resolve1 { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s DNSOverTLS = '...'; readonly a(iiay) DNS = [...]; + readonly a(iiayqs) DNSEx = [...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly a(iiay) FallbackDNS = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(iiayqs) FallbackDNSEx = [...]; readonly (iiay) CurrentDNSServer = ...; + readonly (iiayqs) CurrentDNSServerEx = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly a(isb) Domains = [...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") @@ -148,6 +154,8 @@ node /org/freedesktop/resolve1 { }; + + @@ -166,10 +174,16 @@ node /org/freedesktop/resolve1 { + + + + + + @@ -194,6 +208,8 @@ node /org/freedesktop/resolve1 { + + @@ -230,10 +246,16 @@ node /org/freedesktop/resolve1 { + + + + + + @@ -547,6 +569,7 @@ node /org/freedesktop/resolve1/link/_1 { interface org.freedesktop.resolve1.Link { methods: SetDNS(in a(iay) addresses); + SetDNSEx(in a(iayqs) addresses); SetDomains(in a(sb) domains); SetDefaultRoute(in b enable); SetLLMNR(in s mode); @@ -561,8 +584,12 @@ node /org/freedesktop/resolve1/link/_1 { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly a(iay) DNS = [...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") + readonly a(iayqs) DNSEx = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly (iay) CurrentDNSServer = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") + readonly (iayqs) CurrentDNSServerEx = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly a(sb) Domains = [...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly b DefaultRoute = ...; @@ -585,6 +612,8 @@ node /org/freedesktop/resolve1/link/_1 { }; + + @@ -601,8 +630,12 @@ node /org/freedesktop/resolve1/link/_1 { + + + + @@ -623,6 +656,8 @@ node /org/freedesktop/resolve1/link/_1 { + + @@ -643,8 +678,12 @@ node /org/freedesktop/resolve1/link/_1 { + + + + diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index e9986335a3..5d9b8ffce8 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -138,6 +138,7 @@ node /org/freedesktop/systemd1 { CancelJob(in u id); ClearJobs(); ResetFailed(); + SetShowStatus(in s mode); ListUnits(out a(ssssssouso) units); ListUnitsFiltered(in as states, out a(ssssssouso) units); @@ -505,6 +506,8 @@ node /org/freedesktop/systemd1 { + + @@ -781,6 +784,8 @@ node /org/freedesktop/systemd1 { + + @@ -2183,8 +2188,12 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly t TimeoutAbortUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") - readonly t RuntimeMaxUSec = ...; + readonly s TimeoutStartFailureMode = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s TimeoutStopFailureMode = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly t RuntimeMaxUSec = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly t WatchdogUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly t WatchdogTimestamp = ...; @@ -2695,6 +2704,10 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { + + + + @@ -3179,6 +3192,10 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { + + + + @@ -3825,6 +3842,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly b PassSecurity = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly b PassPacketInfo = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly b RemoveOnStop = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly a(ss) Listen = [...]; @@ -4348,6 +4367,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { + + @@ -4856,6 +4877,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { + + From 35f4e010da3e3366712caa8b4867f28e7690c7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Aug 2020 12:39:01 +0200 Subject: [PATCH 3/4] man: add RootImageOptions and associated bits to dbus api docs Relevant commits: b3d133148ea802e44ec913b2766c811ac2316f9a, 18d73705874f9bf0643485714e9dc069a2e9b599. --- man/org.freedesktop.systemd1.xml | 174 +++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 5d9b8ffce8..cee79700ef 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -2469,6 +2469,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly s RootImage = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ss) RootImageOptions = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHash = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashPath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHashSignature = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashSignaturePath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootVerity = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ssba(ss)) MountImages = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly i OOMScoreAdjust = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t CoredumpFilter = ...; @@ -2960,6 +2974,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { + + + + + + + + + + + + + + @@ -3490,6 +3518,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { + + + + + + + + + + + + + + @@ -4096,6 +4138,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly s RootImage = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ss) RootImageOptions = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHash = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashPath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHashSignature = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashSignaturePath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootVerity = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ssba(ss)) MountImages = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly i OOMScoreAdjust = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t CoredumpFilter = ...; @@ -4607,6 +4663,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { + + + + + + + + + + + + + + @@ -5135,6 +5205,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { + + + + + + + + + + + + + + @@ -5465,6 +5549,8 @@ node /org/freedesktop/systemd1/unit/home_2emount { readonly b LazyUnmount = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly b ForceUnmount = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly b ReadWriteOnly = ...; readonly s Result = '...'; readonly u UID = ...; readonly u GID = ...; @@ -5675,6 +5761,20 @@ node /org/freedesktop/systemd1/unit/home_2emount { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly s RootImage = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ss) RootImageOptions = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHash = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashPath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHashSignature = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashSignaturePath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootVerity = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ssba(ss)) MountImages = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly i OOMScoreAdjust = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t CoredumpFilter = ...; @@ -5912,6 +6012,8 @@ node /org/freedesktop/systemd1/unit/home_2emount { + + @@ -6114,6 +6216,20 @@ node /org/freedesktop/systemd1/unit/home_2emount { + + + + + + + + + + + + + + @@ -6350,6 +6466,8 @@ node /org/freedesktop/systemd1/unit/home_2emount { + + @@ -6562,6 +6680,20 @@ node /org/freedesktop/systemd1/unit/home_2emount { + + + + + + + + + + + + + + @@ -7223,6 +7355,20 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly s RootImage = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ss) RootImageOptions = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHash = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashPath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly ay RootHashSignature = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootHashSignaturePath = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly s RootVerity = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly a(ssba(ss)) MountImages = [...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly i OOMScoreAdjust = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t CoredumpFilter = ...; @@ -7650,6 +7796,20 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { + + + + + + + + + + + + + + @@ -8086,6 +8246,20 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { + + + + + + + + + + + + + + From 3c682b17ced9e2753808cecd7c72137359c49bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Aug 2020 12:28:15 +0200 Subject: [PATCH 4/4] docs: add man/update-dbus-docs step to release instructions --- docs/RELEASE.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/RELEASE.md b/docs/RELEASE.md index b56635a211..b9bf196ccb 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -10,12 +10,13 @@ layout: default 2. Update the contributors list in NEWS (`ninja -C build git-contrib`) 3. Update the time and place in NEWS 4. Update version and library numbers in `meson.build` -5. Tag the release: `version=vXXX-rcY && git tag -s "${version}" -m "systemd ${version}"` -6. Do `ninja -C build` -7. Make sure that the version string and package string match: `build/systemctl --version` -8. Upload the documentation: `ninja -C build doc-sync` -9. [After final release] Close the github milestone and open a new one (https://github.com/systemd/systemd/milestones) -10. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate. -11. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically. -12. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released`) -13. [After final release] Also push commits to stable, create an empty -stable branch: `git push systemd-stable origin/master:master origin/master:refs/heads/${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches). +5. Check dbus docs with `ninja -C build man/update-dbus-docs` +6. Tag the release: `version=vXXX-rcY && git tag -s "${version}" -m "systemd ${version}"` +7. Do `ninja -C build` +8. Make sure that the version string and package string match: `build/systemctl --version` +9. Upload the documentation: `ninja -C build doc-sync` +10. [After final release] Close the github milestone and open a new one (https://github.com/systemd/systemd/milestones) +11. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate. +12. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically. +13. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released`) +14. [After final release] Also push commits to stable, create an empty -stable branch: `git push systemd-stable origin/master:master origin/master:refs/heads/${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches).