diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-08-22 15:59:32 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-08-22 22:20:42 +0200 |
| commit | 615226abd8b5309dca5f45b20f250f8fd23c7721 (patch) | |
| tree | 03bc615e0297568a016e01a01f1ba001d5c35fae /shell-completion | |
| parent | Revert "nspawn: fix settings leak for init parameter" (diff) | |
| download | systemd-615226abd8b5309dca5f45b20f250f8fd23c7721.tar.xz systemd-615226abd8b5309dca5f45b20f250f8fd23c7721.zip | |
Revert "nspawn: Allow specifying custom init program"
I don't actually need this anymore since we're going with a
unit based approach for the containers stuff internally so
let's just revert it.
Fixes #34085
This reverts commit ce2291730d5f91190e97e7c515ac772ae4970062.
Diffstat (limited to 'shell-completion')
| -rw-r--r-- | shell-completion/bash/systemd-nspawn | 2 | ||||
| -rw-r--r-- | shell-completion/zsh/_systemd-nspawn | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn index fc0286c8e1..0a1761d110 100644 --- a/shell-completion/bash/systemd-nspawn +++ b/shell-completion/bash/systemd-nspawn @@ -74,7 +74,7 @@ _systemd_nspawn() { --pivot-root --property --private-users --private-users-ownership --network-namespace-path --network-ipvlan --network-veth-extra --network-zone -p --port --system-call-filter --overlay --overlay-ro --settings --rlimit --hostname --no-new-privileges --oom-score-adjust --cpu-affinity - --resolv-conf --timezone --root-hash-sig --background --oci-bundle --verity-data --init' + --resolv-conf --timezone --root-hash-sig --background --oci-bundle --verity-data' ) _init_completion || return diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn index 1f510ccb74..a9856b5008 100644 --- a/shell-completion/zsh/_systemd-nspawn +++ b/shell-completion/zsh/_systemd-nspawn @@ -21,7 +21,6 @@ _arguments \ '(--ephemeral -x)'{--ephemeral,-x}'[Run container with snapshot of root directory, and remove it after exit.]' \ '(--image -i)'{--image=,-i+}'[Disk image to mount the root directory for the container from.]:disk image: _files' \ '(--boot -b)'{--boot,-b}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \ - '--init=[Invoke the specified program as init in the container.]: : _message "path to init"' \ '(--user -u)'{--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]:user:_users' \ '(--machine -M)'{--machine=,-M+}'[Sets the machine name for this container.]: : _message "container name"' \ '--uuid=[Set the specified uuid for the container.]: : _message "container UUID"' \ |