From 1b967529d225077f063d10fbc647f55d6c3aae0e Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Wed, 19 Oct 2022 14:42:42 +0200
Subject: [PATCH 1/2] dissect: add missing --umount to the help output

---
 src/dissect/dissect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 6b0616e4bbe..a216b6c1bbf 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -79,6 +79,7 @@ static int help(void) {
 
         printf("%1$s [OPTIONS...] IMAGE\n"
                "%1$s [OPTIONS...] --mount IMAGE PATH\n"
+               "%1$s [OPTIONS...] --umount PATH\n"
                "%1$s [OPTIONS...] --copy-from IMAGE PATH [TARGET]\n"
                "%1$s [OPTIONS...] --copy-to IMAGE [SOURCE] PATH\n\n"
                "%5$sDissect a file system OS image.%6$s\n\n"

From 808ec9df3882b4df7cce9e9d937ddacc21a22f64 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Wed, 19 Oct 2022 14:43:50 +0200
Subject: [PATCH 2/2] bash-completion: add systemd-dissect support

---
 shell-completion/bash/systemd-dissect | 104 ++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 shell-completion/bash/systemd-dissect

diff --git a/shell-completion/bash/systemd-dissect b/shell-completion/bash/systemd-dissect
new file mode 100644
index 00000000000..5e1ce05e72c
--- /dev/null
+++ b/shell-completion/bash/systemd-dissect
@@ -0,0 +1,104 @@
+# systemd-dissect(1) completion                       -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd 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.
+#
+# systemd 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 systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd_dissect() {
+    local comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev_1=${COMP_WORDS[COMP_CWORD-1]} prev_2=${COMP_WORDS[COMP_CWORD-2]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version
+                     --no-pager
+                     --no-legend
+                     -r --read-only
+                     --mkdir
+                     --rmdir'
+        [ARG]='-m --mount -M
+               -u --umount -U
+               -x --copy-from
+               -a --copy-to
+               --fsck
+               --growfs
+               --discard
+               --root-hash
+               --root-hash-sig
+               --verity-data
+               --json'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev_1" ${OPTS[ARG]}; then
+        case $prev_1 in
+            -m|--mount|-M|-x|--copy-from|-a|--copy-to|--verity-data)
+                comps=$(compgen -A file -- "$cur")
+                compopt -o filenames
+                ;;
+            -u|--umount|-U)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            --fsck|--growfs)
+                comps='yes no'
+                ;;
+            --discard)
+                comps='disabled loop all crypto'
+                ;;
+            --root-hash-sig)
+                comps="base64: $(compgen -A file -- "$cur")"
+                compopt -o filenames
+                ;;
+            --json)
+                comps='pretty short off'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if __contains_word "$prev_2" ${OPTS[ARG]}; then
+        case $prev_2 in
+            -m|--mount|-M)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            *)
+                comps=$(compgen -A file -- "$cur" )
+                compopt -o filenames
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -A file -- "$cur") )
+    compopt -o filenames
+    return 0
+}
+
+complete -F _systemd_dissect systemd-dissect