github: add more components to issue template

2 files changed, 52 insertions, 11 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 44e6309d99..0f1feb6033 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -75,29 +75,70 @@ body:
       options:
         - 'bootctl'
         - 'homectl'
+        - 'hostnamectl'
+        - 'hardware database files'
         - 'journalctl'
+        - 'kernel-install'
         - 'loginctl'
+        - 'machinectl'
         - 'networkctl'
         - 'nss-resolve'
+        - 'oomctl'
         - 'pam_systemd'
         - 'pam_systemd_home'
+        - 'portablectl'
         - 'resolvectl'
+        - 'rpm scriptlets'
         - 'systemctl'
         - 'systemd'
+        - 'systemd-analyze'
+        - 'systemd-ask-password'
+        - 'systemd-binfmt'
         - 'systemd-boot'
+        - 'systemd-cgtop'
+        - 'systemd-cryptsetup'
+        - 'systemd-delta'
+        - 'systemd-env-generator'
+        - 'systemd-fsck'
+        - 'systemd-gpt-auto-generator'
+        - 'systemd-growfs'
         - 'systemd-homed'
+        - 'systemd-hostnamed'
+        - 'systemd-import'
+        - 'systemd-journal-gatewayd'
+        - 'systemd-journal-remote'
+        - 'systemd-journal-upload'
         - 'systemd-journald'
         - 'systemd-logind'
+        - 'systemd-machined'
+        - 'systemd-modules-load'
+        - 'systemd-network-generator'
         - 'systemd-networkd'
         - 'systemd-networkd-wait-online'
         - 'systemd-nspawn'
+        - 'systemd-oomd'
+        - 'systemd-portabled'
+        - 'systemd-pstore'
+        - 'systemd-repart'
         - 'systemd-resolved'
+        - 'systemd-rfkill'
+        - 'systemd-run'
         - 'systemd-stub'
+        - 'systemd-sysctl'
+        - 'systemd-sysext'
+        - 'systemd-sysusers'
+        - 'systemd-sysv-generator'
+        - 'systemd-timedate'
+        - 'systemd-timesync'
+        - 'systemd-tmpfiles'
         - 'systemd-udevd'
-        - 'the bootloader itself'
-        - 'udev builtins'
+        - 'systemd-userdb'
+        - 'systemd-veritysetup'
+        - 'systemd-xdg-autostart-generator'
+        - 'timedatectl'
         - 'udevadm'
-        - '.network files'
+        - 'udev rule files'
+        - 'userdbctl'
         - 'tests'
         - 'other'
     validations:
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index 9961c9ce0e..fe1daff513 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -9,21 +9,21 @@ policy:
   cgtop: ['systemd-cgtop']
   cryptsetup: ['systemd-cryptsetup']
   delta: ['systemd-delta']
-  env: ['systemd-env-generator', '30-systemd-environment-d-generator']
+  env: ['systemd-env-generator']
   fsck: ['systemd-fsck']
   gpt-auto: ['systemd-gpt-auto-generator']
   growfs: ['systemd-growfs']
   homed: ['systemd-homed', 'homectl', 'pam_systemd_home']
   hostname: ['systemd-hostnamed', 'hostnamectl']
-  hwdb: ['the hardware database files']
-  import: ['systemd-importd', 'systemd-import and backends']
+  hwdb: ['hardware database files']
+  import: ['systemd-import']
   journal: ['systemd-journald', 'journalctl']
   journal-remote: ['systemd-journal-remote', 'systemd-journal-upload', 'systemd-journal-gatewayd']
-  kernel-install: ['kernel-install (incl. any plugins)']
+  kernel-install: ['kernel-install']
   logind: ['systemd-logind', 'loginctl', 'pam_systemd']
   machined: ['systemd-machined', 'machinectl']
   modules-load: ['systemd-modules-load']
-  network: ['systemd-networkd', 'networkctl', 'systemd-networkd-wait-online', '.network files']
+  network: ['systemd-networkd', 'networkctl', 'systemd-networkd-wait-online', 'systemd-network-generator']
   nspawn: ['systemd-nspawn']
   oomd: ['systemd-oomd', 'oomctl']
   pid1: ['systemd']
@@ -34,17 +34,17 @@ policy:
   rfkill: ['systemd-rfkill']
   rpm: ['rpm scriptlets']
   run: ['systemd-run']
-  sd-boot: ['the bootloader itself', 'bootctl', 'systemd-boot', 'systemd-stub']
+  sd-boot: ['bootctl', 'systemd-boot', 'systemd-stub']
   sysctl: ['systemd-sysctl']
   sysext: ['systemd-sysext']
   systemctl: ['systemctl']
   sysusers: ['systemd-sysusers']
   sysv: ['systemd-sysv-generator']
   tests: ['tests']
-  timedate: ['systemd-timedate']
+  timedate: ['systemd-timedate', 'timedatectl']
   timesync: ['systemd-timesync']
   tmpfiles: ['systemd-tmpfiles']
-  udev: ['systemd-udevd', 'udevadm', 'udev builtins']
+  udev: ['systemd-udevd', 'udevadm', 'udev rule files']
   userdb: ['systemd-userdb', 'userdbctl']
   veritysetup: ['systemd-veritysetup']
   xdg-autostart: ['systemd-xdg-autostart-generator']