From 26adf7741d95f412a468160f7c66b5df56c10bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jul 2017 15:25:50 -0400 Subject: [PATCH 1/3] man: describe which units types are stopped on isolate Fixes #6455. --- man/systemctl.xml | 8 +++++--- man/systemd.unit.xml | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index 14405141cfc..615d62a13f0 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -819,9 +819,11 @@ Sun 2017-02-26 20:57:49 EST 2h 3min left Sun 2017-02-26 11:56:36 EST 6h ago isolate NAME - Start the unit specified on the command line and its - dependencies and stop all others. If a unit name with no - extension is given, an extension of + Start the unit specified on the command line and its dependencies + and stop all others, unless they have + (see + systemd.unit5). + If a unit name with no extension is given, an extension of .target will be assumed. This is similar to changing the runlevel in a diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index dedeb6c6d01..d58a2f56db9 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -651,10 +651,11 @@ IgnoreOnIsolate= - Takes a boolean argument. If - , this unit will not be stopped when - isolating another unit. Defaults to - . + Takes a boolean argument. If , this unit + will not be stopped when isolating another unit. Defaults to + for service, target, socket, busname, timer, and path + units, and for slice, scope, device, swap, mount, and + automount units. From cb1c2d174c1170e89cb69c44c372bd54ca75ce2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jul 2017 15:53:30 -0400 Subject: [PATCH 2/3] man: do not encourgage starting of poweroff/halt/reboot/kexec targets directly Going through logind and systemd allows polkit to be used, the job mode will be set properly, and is generally easier to get correct. Fixes #6452. --- man/systemd.special.xml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 66c45e39a3c..b31c087c763 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -305,8 +305,12 @@ really just halts the system rather than powering it down. - Applications wanting to halt the system should start - this unit. + Applications wanting to halt the system should not start this unit + directly, but should instead execute systemctl halt + (possibly with the option) or call + systemd1's + org.freedesktop.systemd1.Manager.Halt D-Bus method + directly. @@ -336,8 +340,12 @@ A special target unit for shutting down and rebooting the system via kexec. - Applications wanting to reboot the system with kexec - should start this unit. + Applications wanting to reboot the system should not start this unit + directly, but should instead execute systemctl kexec + (possibly with the option) or call + systemd1's + org.freedesktop.systemd1.Manager.KExec D-Bus method + directly. @@ -430,8 +438,12 @@ A special target unit for shutting down and powering off the system. - Applications wanting to power off the system should - start this unit. + Applications wanting to reboot the system should not start this unit + directly, but should instead execute systemctl poweroff + (possibly with the option) or call + systemd-logind8's + org.freedesktop.login1.Manager.PowerOff D-Bus method + directly. runlevel0.target is an alias for this target unit, for compatibility with SysV. @@ -443,8 +455,12 @@ A special target unit for shutting down and rebooting the system. - Applications wanting to reboot the system should start - this unit. + Applications wanting to reboot the system should not start this unit + directly, but should instead execute systemctl reboot + (possibly with the option) or call + systemd-logind8's + org.freedesktop.login1.Manager.Reboot D-Bus method + directly. runlevel6.target is an alias for this target unit, for compatibility with SysV. From 44ec14e13b94beebd17a1b4d0be28954dd197593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jul 2017 16:04:52 -0400 Subject: [PATCH 3/3] =?UTF-8?q?man:=20do=20not=20recommend=20rescue.target?= =?UTF-8?q?=20for=20alt-=E2=86=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rescue.target does not work well, and we don't have a suitable emergency shell unit that can be started on existing systems right now. So let's just remove the recommendation for now. Fixes #6451. --- man/systemd.special.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/systemd.special.xml b/man/systemd.special.xml index b31c087c763..8522ff07619 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -329,9 +329,9 @@ kbrequest.target systemd starts this target whenever Alt+ArrowUp is - pressed on the console. This is a good candidate to be - aliased (symlinked) to - rescue.target. + pressed on the console. Note that any user with physical access + to the machine will be able to do this, without authentication, + so this should be used carefully.