From: Sven Eden Date: Tue, 14 Aug 2018 16:07:33 +0000 (+0200) Subject: Prep v239: Remove portabled, rc-local and time-sync. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f065a4b31d6b1a4995eee02a920c93cbed904822 Prep v239: Remove portabled, rc-local and time-sync. They, or at least bits of them, have slithered in during migration. --- diff --git a/man/elogind-portabled.service.xml b/man/elogind-portabled.service.xml deleted file mode 100644 index 061e347cf..000000000 --- a/man/elogind-portabled.service.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - elogind-portabled.service - elogind - - - - elogind-portabled.service - 8 - - - - elogind-portabled.service - elogind-portabled - Portable service manager - - - - elogind-portabled.service - /usr/lib/elogind/elogind-portabled - - - - Description - - elogind-portabled is a system service that may be used to attach, detach and inspect - portable service images. - - Most of elogind-portabled's functionality is accessible through the - portablectl1 command. - - See the Portable - Services Documentation for details about the concepts this service implements. - - - - See Also - - elogind1, - portablectl1 - - - - diff --git a/man/elogind-rc-local-generator.xml b/man/elogind-rc-local-generator.xml deleted file mode 100644 index d2f8d48b8..000000000 --- a/man/elogind-rc-local-generator.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - elogind-rc-local-generator - elogind - - - - elogind-rc-local-generator - 8 - - - - elogind-rc-local-generator - Compatibility generator for starting /etc/rc.local and /usr/sbin/halt.local during boot and shutdown - - - - /usr/lib/elogind/system-generators/elogind-rc-local-generator - - - - Description - - elogind-rc-local-generator is a generator that checks whether - /etc/rc.local exists and is executable, and if it is pulls the - rc-local.service unit into the boot process. This unit is responsible for running this script - during late boot. Note that the script will be run with slightly different semantics than the original System V - version, which was run "last" in the boot process, which is a concept that does not translate to elogind. The - script is run after network.target, but in parallel with most other regular system - services. - - elogind-rc-local-generator also checks whether /usr/sbin/halt.local - exists and is executable, and if it is pulls the halt-local.service unit into the shutdown - process. This unit is responsible for running this script during later shutdown. - - Support for both /etc/rc.local and /usr/sbin/halt.local is provided - for compatibility with specific System V systems only. However, it is strongly recommended to avoid making use of - these scripts today, and instead provide proper unit files with appropriate dependencies for any scripts to run - during the boot or shutdown processes. - - elogind-rc-local-generator implements - elogind.generator7. - - - - See Also - - elogind1, - systemctl1 - - - - diff --git a/man/elogind-time-wait-sync.service.xml b/man/elogind-time-wait-sync.service.xml deleted file mode 100644 index fb1a68b71..000000000 --- a/man/elogind-time-wait-sync.service.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - elogind-time-wait-sync.service - elogind - - - - elogind-time-wait-sync.service - 8 - - - - elogind-time-wait-sync.service - elogind-time-wait-sync - Wait Until Kernel Time Synchronized - - - - elogind-time-wait-sync.service - /usr/lib/elogind/elogind-time-wait-sync - - - - Description - - elogind-time-wait-sync is a system service that delays the start of units that depend on - time-sync.target until the system time has been synchronized with an accurate time source by - elogind-timesyncd.service. - - elogind-timesyncd.service notifies on successful synchronization. - elogind-time-wait-sync also tries to detect when the kernel marks the time as synchronized, - but this detection is not reliable and is intended only as a fallback for other servies that can be used to - synchronize time (e.g., ntpd, chronyd). - - - - - Files - - - - /run/systemd/timesync/synchronized - - - The presence of this file indicates to this service that the system clock has been synchronized. - - - - - - - - - See Also - - elogind1, - elogind.special7, - elogind-timesyncd.service8, - - - - diff --git a/man/portablectl.xml b/man/portablectl.xml deleted file mode 100644 index 4a1341828..000000000 --- a/man/portablectl.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - portablectl - elogind - - - - portablectl - 1 - - - - portablectl - Attach, detach or inspect portable service images - - - - - portablectl - OPTIONS - COMMAND - NAME - - - - - Description - - portablectl may be used to attach, detach or inspect portable service images. It's - primarily a command interfacing with - elogind-portabled.service8. - - Portable service images contain an OS file system tree along with - elogind1 unit file - information. A service image may be "attached" to the local system. If attached, a set of unit files are copied - from the image to the host, and extended with RootDirectory= or RootImage= - assignments (in case of service units) pointing to the image file or directory, ensuring the services will run - within the file system context of the image. - - Portable service images are an efficient way to bundle multiple related services and other units together, - and transfer them as a whole between systems. When these images are attached the local system the contained units - may run in most ways like regular system-provided units, either with full privileges or inside strict sandboxing, - depending on the selected configuration. - - Specifically portable service images may be of the following kind: - - - Directory trees containing an OS, including the top-level directories /usr/, - /etc/, and so on. - - btrfs subvolumes containing OS trees, similar to normal directory trees. - - Binary "raw" disk images containing MBR or GPT partition tables and Linux file system - partitions. - - - - - - Options - - The following options are understood: - - - - - - - Suppresses additional informational output while running. - - - - PROFILE - PROFILE - - When attaching an image, select the profile to use. By default the default - profile is used. For details about profiles, see below. - - - - - - When attaching an image, select whether to prefer copying or symlinking of files installed into - the host system. Takes one of copy (to prefer copying of files), symlink - (to prefer creation of symbolic links) or auto for an intermediary mode where security - profile drop-ins are symlinked while unit files are copied. Note that this option expresses a preference only, - in cases where symbolic links cannot be created — for example when the image operated on is a raw disk image, - and hence not directly referentiable from the host file system — copying of files is used - unconditionally. - - - - - - When specified the unit and drop-in files are placed in - /run/systemd/system/ instead of /etc/systemd/system/. Images attached - with this option set hence remain attached only until the next reboot, while they are normally attached - persistently. - - - - - - Don't reload the service manager after attaching or detaching a portable service - image. Normally the service manager is reloaded to ensure it is aware of added or removed unit - files. - - - - - - When inspecting portable service images, show the (unprocessed) contents of the metadata files - pulled from the image, instead of brief summaries. Specifically, this will show the - os-release5 and unit file - contents of the image. - - - - - - - - - - - - - - - Commands - - The following commands are understood: - - - - - list - - List available portable service images. This will list all portable service images discovered - in the portable image search paths (see below), along with brief metadata and state information. Note that many - of the commands below may both operate on images inside and outside of the search paths. This command is hence - mostly a convenience option, the commands are generally not restricted to what this list - shows. - - - - attach IMAGE [PREFIX…] - - Attach a portable service image to the host system. Expects a file system path to a portable - service image file or directory as first argument. If the specified path contains no slash character - (/) it is understood as image filename that is searched for in the portable service image - search paths (see below). To reference a file in the current working directory prefix the filename with - ./ to avoid this search path logic. - - When a portable service is attached four operations are executed: - - - - All unit files of types .service, .socket, - .target, .timer and .path which match the - indicated unit file name prefix are copied from the image to the host's - /etc/systemd/system/ directory (or /run/systemd/system/ — depending - whether is specified, see above). - - For unit files of type .service a drop-in is added to these copies that - adds RootDirectory= or RootImage= settings (see - elogind.unit5 for - details), that ensures these services are run within the file system of the originating portable service - image. - - A second drop-in is created: the "profile" drop-in, that may contain additional security - settings (and other settings). A number of profiles are available by default but administrators may define - their own ones. See below. - - If the portable service image file is not already in the search path (see below), a symbolic - link to it is created in /etc/portables/ or - /run/portables/, to make sure it is included in it. - - - By default all unit files whose names start with a prefix generated from the image's file name are copied - out. Specifically, the prefix is determined from the image file name with any suffix such as - .raw removed, truncated at the first occurrence of and underscore character - (_), if there is one. The underscore logic is supposed to be used to versioning so that the - an image file foobar_47.11.raw will result in a unit file matching prefix of - foobar. This prefix is then compared with all unit files names contained in the image in - the usual directories, but only unit file names where the prefix is followed by -, - . or @ are considered. Example: if a portable service image file is named - foobar_47.11.raw then by default all its unit files with names such as - foobar-quux-waldi.service, foobar.service or - foobar@.service will be considered. It's possible to override the matching prefix: all - strings listed on the command line after the image file name are considered prefixes, overriding the implicit - logic where the prefix is derived from the image file name. - - By default, after the unit files are attached the service manager's configuration is reloaded, except - when is specified (see above). This ensures that the new units made available to - the service manager are seen by it. - - - - - detach IMAGE - - Detaches a portable service image from the host. This undoes the operations executed by the - attach command above, and removes the unit file copies, drop-ins and image symlink - again. This command expects an image name or path as parameter. Note that if a path is specified only the last - component of it (i.e. the file or directory name itself, not the path to it) is used for finding matching unit - files. This is a convencience feature to allow all arguments passed as attach also to - detach. - - - - inspect IMAGE [PREFIX…] - - Extracts various metadata from a portable service image and presents it to the - caller. Specifically, the - os-release5 file of the - image is retrieved as well as all matching unit files. By default a short summary showing the most relevant - metadata in combination with a list of matching unit files is shown (that is the unit files - attach would install to the host system). If combined with (see - above), the os-release data and the units files' contents is displayed unprocessed. This - command is useful to determine whether an image qualifies as portable service image, and which unit files are - included. This command expects the path to the image as parameter, optionally followed by a list of unit file - prefixes to consider, similar to the attach command described above. - - - - - is-attached IMAGE - - Determines whether the specified image is currently attached or not. Unless combined with the - switch this will show a short state identifier for the image. Specifically: - - - Image attachment states - - - - - - State - Description - - - - - - The image is currently not attached. - - - - The image is currently attached, i.e. its unit files have been made available to the host system. - - - - Like , but the unit files have been made available transiently only, i.e. the attach command has been invoked with the option. - - - - The image is currently attached, and at least one unit file associated with it has been enabled. - - - - Like , but the the unit files have been made available transiently only, i.e. the attach command has been invoked with the option. - - - - The image is currently attached, and at least one unit file associated with it is running. - - - - The image is currently attached transiently, and at least one unit file associated with it is running. - - - -
- - - - - - read-only IMAGE [BOOL] - - Marks or (unmarks) a portable service image read-only. Takes an image name, followed by a - boolean as arguments. If the boolean is omitted, positive is implied, i.e. the image is marked - read-only. - - - - remove IMAGE… - - Removes one or more portable service images. Note that this command will only remove the - specified image path itself — it refers to a symbolic link then the symbolic link is removed and not the - image it points to. - - - - set-limit [IMAGE] BYTES - - Sets the maximum size in bytes that a specific portable service image, or all images, may grow - up to on disk (disk quota). Takes either one or two parameters. The first, optional parameter refers to a - portable service image name. If specified, the size limit of the specified image is changed. If omitted, the - overall size limit of the sum of all images stored locally is changed. The final argument specifies the size - limit in bytes, possibly suffixed by the usual K, M, G, T units. If the size limit shall be disabled, specify - - as size. - - Note that per-image size limits are only supported on btrfs file systems. Also, depending on - BindPaths= settings in the portable service's unit files directories from the host might be - visible in the image environment during runtime which are not affected by this setting, as only the image - itself is counted against this limit. - - - - - - - - Files and Directories - - Portable service images are preferably stored in /var/lib/portables/, but are also - searched for in /etc/portables/, /run/systemd/portables/, - /usr/local/lib/portables/ and /usr/lib/portables/. It's recommended not - to place image files directly in /etc/portables/ or - /run/systemd/portables/ (as these are generally not suitable for storing large or non-textual - data), but use these directories only for linking images located elsewhere into the image search path. - - - - Profiles - - When portable service images are attached a "profile" drop-in is linked in, which may be used to enforce - additional security (and other) restrictions locally. Four profile drop-ins are defined by default, and shipped in - /usr/lib/elogind/portable/profile/. Additional, local profiles may be defined by placing them - in /etc/elogind/portable/profile/. The default profiles are: - - - Profiles - - - - - - Name - Description - - - - - default - This is the default profile if no other profile name is set via the (see above). It's fairly restrictive, but should be useful for common, unprivileged system workloads. This includes write access to the logging framework, as well as IPC access to the D-Bus system. - - - nonetwork - Very similar to default, but networking is turned off for any services of the portable service image. - - - strict - A profile with very strict settings. This profile excludes IPC (D-Bus) and network access. - - - trusted - A profile with very relaxed settings. In this profile the services run with full privileges. - - - -
- - For details on this profiles, and their effects please have a look at their precise definitions, - e.g. /usr/lib/elogind/portable/profile/default/service.conf and similar. - - - - Exit status - - On success, 0 is returned, a non-zero failure code otherwise. - - - - - - See Also - - elogind1, - elogind-portabled.service8 - - - - diff --git a/man/rules/meson.build b/man/rules/meson.build index d458f119a..3a47be9da 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -1,17 +1,10 @@ # Do not edit. Generated by make-man-rules.py. manpages = [ -['elogind-portabled.service', '8', ['elogind-portabled'], 'ENABLE_PORTABLED'], - ['elogind-rc-local-generator', '8', [], ''], - ['elogind-time-wait-sync.service', - '8', - ['elogind-time-wait-sync'], - 'ENABLE_TIMESYNCD'], - ['elogind', '8', [], ''], +['elogind', '8', [], ''], ['elogind.syntax', '7', [], ''], ['loginctl', '1', [], ''], ['logind.conf', '5', [], ''], ['pam_elogind', '8', [], 'HAVE_PAM'], - ['portablectl', '1', [], 'ENABLE_PORTABLED'], ['sd-bus', '3', [], ''], ['sd-event', '3', [], ''], ['sd-login', '3', [], 'HAVE_PAM'], diff --git a/shell-completion/bash/portablectl b/shell-completion/bash/portablectl deleted file mode 100644 index 80bec8f22..000000000 --- a/shell-completion/bash/portablectl +++ /dev/null @@ -1,112 +0,0 @@ -# portablectl(1) completion -*- shell-script -*- -# SPDX-License-Identifier: LGPL-2.1+ -# -# This file is part of elogind. -# -# -# elogind is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# elogind is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with elogind; If not, see . - -__contains_word () { - local w word=$1; shift - for w in "$@"; do - [[ $w = "$word" ]] && return - done -} - -__get_machines() { - local a b - machinectl list --no-legend --no-pager 2>/dev/null | - { while read a b; do echo " $a"; done; }; -} - -_portablectl() { - local i n comps verb - local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - local -A OPTS=( - [STANDALONE]='-q --quiet --runtime --no-reload --cat --no-pager --no-legend - --no-ask-password -h --help --version' - [ARG]='-p --profile --copy -H --host -M --machine' - ) - - local -A VERBS=( - [STANDALONE]='list' - [IMAGE]='attach detach inspect is-attached set-limit' - [IMAGES]='remove' - [IMAGE_WITH_BOOL]='read-only' - ) - - if __contains_word "$prev" ${OPTS[ARG]}; then - case $prev in - --profile|-p) - comps="default nonetwork strict trusted" - ;; - --copy) - comps="copy symlink auto" - ;; - --host|-H) - comps=$(compgen -A hostname) - ;; - --machine|-M) - comps=$( __get_machines ) - ;; - esac - COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) - return 0 - fi - - if [[ "$cur" = -* ]]; then - COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) - return 0 - fi - - for ((i=0; i < COMP_CWORD; i++)); do - if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && - ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then - verb=${COMP_WORDS[i]} - break - fi - done - - n=$(($COMP_CWORD - $i)) - - if [[ -z $verb ]]; then - comps=${VERBS[*]} - elif __contains_word "$verb" ${VERBS[STANDALONE]}; then - comps='' - elif __contains_word "$verb" ${VERBS[IMAGE]}; then - if [[ $n == 1 ]]; then - comps=$( compgen -A file -- "$cur" ) - compopt -o filenames - else - comps='' - fi - elif __contains_word "$verb" ${VERBS[IMAGES]}; then - comps=$( compgen -A file -- "$cur" ) - compopt -o filenames - elif __contains_word "$verb" ${VERBS[IMAGE_WITH_BOOL]}; then - if [[ $n == 1 ]]; then - comps=$( compgen -A file -- "$cur" ) - compopt -o filenames - elif [[ $n == 2 ]]; then - comps='yes no' - else - comps='' - fi - fi - - COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") ) - return 0 -} - -complete -F _portablectl portablectl