From 38cf1e292b00f20ee3b5e4f7ed9d7b942da108b2 Mon Sep 17 00:00:00 2001 From: Eric Cook Date: Sun, 21 Jun 2015 21:59:26 -0400 Subject: [PATCH] zsh-completion: _systemd-nspawn - add more argument completion filenames will be completed for --image/-i/--bind/--bind-ro/--tmpfs network interfaces for --network-(interface|macvlan|ipvlan|bridge) users for --user/-u, yes & no for --register, x86 * x86-64 for --personality display a message of the expected argument for --machine/-M/--uuid --slice/-S/--port/-p/--selinux-*/-Z/-L/--setenv Allow completing commands(and their options) of the host system for COMMAND --- shell-completion/zsh/_systemd-nspawn | 41 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn index 08f5696acb..3e0f667909 100644 --- a/shell-completion/zsh/_systemd-nspawn +++ b/shell-completion/zsh/_systemd-nspawn @@ -17,32 +17,33 @@ _arguments \ {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \ '--template=[Initialize root directory from template directory, if missing.]:template:_directories' \ {--ephemeral,-x}'[Run container with snapshot of root directory, and remove it after exit.]' \ - {--image=,-i+}'[Disk image to mount the root directory for the container from.]' \ - {--boot=,-b+}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \ - {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]' \ - {--machine=,-M+}'[Sets the machine name for this container.]' \ - '--uuid=[Set the specified uuid for the container.]' \ - {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]' \ + {--image=,-i+}'[Disk image to mount the root directory for the container from.]:disk image: _files' \ + {--boot,-b}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \ + {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]:user:_users' \ + {--machine=,-M+}'[Sets the machine name for this container.]: : _message "container name"' \ + '--uuid=[Set the specified uuid for the container.]: : _message "container UUID"' \ + {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]: : _message slice' \ '--private-network[Disconnect networking of the container from the host.]' \ - '--network-interface=[Assign the specified network interface to the container.]' \ - '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]' \ - '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]' \ + '--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \ + '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \ + '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]: : _net_interfaces' \ {--network-veth,-n}'[Create a virtual Ethernet link (veth) between host and container.]' \ - '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]' \ - {--port=,-p+}'[Expose a container IP port on the host.]' \ - {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]' \ - {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]' \ + '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]: : _net_interfaces' \ + {--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \ + {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]: : _message "SELinux context"' \ + {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]: : _message "SELinux context"' \ '--capability=[List one or more additional capabilities to grant the container.]:capabilities:_nspawn-caps' \ '--drop-capability=[Specify one or more additional capabilities to drop for the containerm]:capabilities:_nspawn-caps' \ "--link-journal=[Control whether the container's journal shall be made visible to the host system.]:options:(no host guest auto)" \ '-j[Equivalent to --link-journal=guest.]' \ '--read-only[Mount the root file system read only for the container.]' \ - '--bind=[Bind mount a file or directory from the host into the container.]' \ - '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]' \ - '--tmpfs=[Mount an empty tmpfs to the specified directory.]' \ - '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]' \ + '--bind=[Bind mount a file or directory from the host into the container.]: : _files' \ + '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]: : _files' \ + '--tmpfs=[Mount an empty tmpfs to the specified directory.]: : _files' \ + '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]: : _message "environment variables"' \ '--share-system[Allows the container to share certain system facilities with the host.]' \ - '--register=[Controls whether the container is registered with systemd-machined(8).]' \ + '--register=[Controls whether the container is registered with systemd-machined(8).]:systemd-machined registration:( yes no )' \ '--keep-unit[Instead of creating a transient scope unit to run the container in, simply register the service or scope unit systemd-nspawn has been invoked in with systemd-machined(8).]' \ - '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]' \ - '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' + '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]:architecture:(x86 x86-64)' \ + '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' \ + '*:: : _normal'