forked from pool/systemd
96aa32bb59
- Ensure journal is flushed on disk when systemd-logger is installed for the first time. - Add improve-journal-perf.patch: improve journal performance on query. - Add support-hybrid-suspend.patch: add support for hybrid suspend. - Add forward-to-pmutils.patch: forward suspend/hibernation calls to pm-utils, if installed (bnc#790157). (forwarded request 155834 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/155884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=132
174 lines
7.5 KiB
Diff
174 lines
7.5 KiB
Diff
Index: systemd-195/bash-completion/systemd-bash-completion.sh
|
|
===================================================================
|
|
--- systemd-195.orig/bash-completion/systemd-bash-completion.sh
|
|
+++ systemd-195/bash-completion/systemd-bash-completion.sh
|
|
@@ -114,15 +114,15 @@ _systemctl () {
|
|
[SNAPSHOTS]='delete'
|
|
[ENVS]='set-environment unset-environment'
|
|
[STANDALONE]='daemon-reexec daemon-reload default dot dump
|
|
- emergency exit halt kexec list-jobs list-units
|
|
- list-unit-files poweroff reboot rescue show-environment'
|
|
+ emergency exit halt hybrid-sleep hibernate kexec list-jobs list-units
|
|
+ list-unit-files poweroff reboot rescue show-environment suspend'
|
|
[NAME]='snapshot load'
|
|
[FILE]='link'
|
|
)
|
|
|
|
for ((i=0; $i <= $COMP_CWORD; i++)); do
|
|
if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
|
|
- ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then
|
|
+ ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
|
|
verb=${COMP_WORDS[i]}
|
|
break
|
|
fi
|
|
@@ -245,7 +245,7 @@ _loginctl () {
|
|
|
|
for ((i=0; $i <= $COMP_CWORD; i++)); do
|
|
if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
|
|
- ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then
|
|
+ ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
|
|
verb=${COMP_WORDS[i]}
|
|
break
|
|
fi
|
|
@@ -280,10 +280,21 @@ _loginctl () {
|
|
}
|
|
complete -F _loginctl loginctl
|
|
|
|
+__journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
|
|
+ ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID}
|
|
+ _{P,U,G}ID _COMM _EXE _CMDLINE
|
|
+ _AUDIT_{SESSION,LOGINUID}
|
|
+ _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
|
|
+ _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
|
|
+ _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
|
|
+ _KERNEL_{DEVICE,SUBSYSTEM}
|
|
+ _UDEV_{SYSNAME,DEVNODE,DEVLINK}
|
|
+ __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
|
|
+
|
|
_journalctl() {
|
|
local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
|
local -A OPTS=(
|
|
- [STANDALONE]='-a --all -b --this-boot -f --follow --header
|
|
+ [STANDALONE]='-a --all -b --this-boot --disk-usage -f --follow --header
|
|
-h --help -l --local --new-id128 -m --merge --no-pager
|
|
--no-tail -q --quiet --setup-keys --this-boot --verify
|
|
--version'
|
|
@@ -291,17 +302,6 @@ _journalctl() {
|
|
[ARGUNKNOWN]='-c --cursor --interval -n --lines -p --priority --since --until
|
|
--verify-key'
|
|
)
|
|
- local journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
|
|
- ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID}
|
|
- _{P,U,G}ID _COMM _EXE _CMDLINE
|
|
- _AUDIT_{SESSION,LOGINUID}
|
|
- _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
|
|
- _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
|
|
- _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
|
|
- _KERNEL_{DEVICE,SUBSYSTEM}
|
|
- _UDEV_{SYSNAME,DEVNODE,DEVLINK}
|
|
- __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
|
|
-
|
|
|
|
if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
|
|
case $prev in
|
|
@@ -313,7 +313,7 @@ _journalctl() {
|
|
comps='short short-monotonic verbose export json cat'
|
|
;;
|
|
--field|-F)
|
|
- comps=${journal_fields[*]}
|
|
+ comps=${__journal_fields[*]}
|
|
;;
|
|
--unit|-u)
|
|
comps=$(journalctl -F '_SYSTEMD_UNIT')
|
|
@@ -337,7 +337,7 @@ _journalctl() {
|
|
COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "$cur") )
|
|
else
|
|
compopt -o nospace
|
|
- COMPREPLY=( $(compgen -W '${journal_fields[*]}' -S= -- "$cur") )
|
|
+ COMPREPLY=( $(compgen -W '${__journal_fields[*]}' -S= -- "$cur") )
|
|
fi
|
|
}
|
|
complete -F _journalctl journalctl
|
|
@@ -476,3 +476,81 @@ _hostnamectl() {
|
|
return 0
|
|
}
|
|
complete -F _hostnamectl hostnamectl
|
|
+
|
|
+__get_all_sysdevs() {
|
|
+ local -a devs=(/sys/bus/*/devices/*/ /sys/class/*/*/)
|
|
+ printf '%s\n' "${devs[@]%/}"
|
|
+}
|
|
+
|
|
+_udevadm() {
|
|
+ local i verb comps
|
|
+ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
|
|
+ local OPTS='-h --help --version --debug'
|
|
+
|
|
+ local -A VERBS=(
|
|
+ [INFO]='info'
|
|
+ [TRIGGER]='trigger'
|
|
+ [SETTLE]='settle'
|
|
+ [CONTROL]='control'
|
|
+ [MONITOR]='monitor'
|
|
+ [HWDB]='hwdb'
|
|
+ [TESTBUILTIN]='test-builtin'
|
|
+ [TEST]='test'
|
|
+ )
|
|
+
|
|
+ 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
|
|
+
|
|
+ if [[ -z $verb && $cur = -* ]]; then
|
|
+ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
|
|
+ return 0
|
|
+ fi
|
|
+
|
|
+ if [[ -z $verb ]]; then
|
|
+ comps=${VERBS[*]}
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[INFO]}; then
|
|
+ if [[ $cur = -* ]]; then
|
|
+ comps='--help --query= --path= --name= --root --attribute-walk --export-db --cleanup-db'
|
|
+ else
|
|
+ comps=$( __get_all_sysdevs )
|
|
+ fi
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[TRIGGER]}; then
|
|
+ comps='--help --verbose --dry-run --type= --action= --subsystem-match=
|
|
+ --subsystem-nomatch= --attr-match= --attr-nomatch= --property-match=
|
|
+ --tag-match= --sysname-match= --parent-match='
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[SETTLE]}; then
|
|
+ comps='--help --timeout= --seq-start= --seq-end= --exit-if-exists= --quiet'
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[CONTROL]}; then
|
|
+ comps='--help --exit --log-priority= --stop-exec-queue --start-exec-queue
|
|
+ --reload --property= --children-max= --timeout='
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[MONITOR]}; then
|
|
+ comps='--help --kernel --udev --property --subsystem-match= --tag-match='
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[HWDB]}; then
|
|
+ comps='--help --update --test='
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[TEST]}; then
|
|
+ if [[ $cur = -* ]]; then
|
|
+ comps='--help --action='
|
|
+ else
|
|
+ comps=$( __get_all_sysdevs )
|
|
+ fi
|
|
+
|
|
+ elif __contains_word "$verb" ${VERBS[TESTBUILTIN]}; then
|
|
+ comps='blkid btrfs firmware hwdb input_id kmod net_id path_id usb_id uaccess'
|
|
+ fi
|
|
+
|
|
+ COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
|
|
+ return 0
|
|
+}
|
|
+complete -F _udevadm udevadm
|