debug-generator: rework from post-merge review #35410 (#35696)

- https://github.com/systemd/systemd/pull/35410#discussion_r1893664993
- https://github.com/systemd/systemd/pull/35410#discussion_r1893667581

4 files changed, 11 insertions, 8 deletions

diff --git a/units/breakpoint-pre-basic.service.in b/units/breakpoint-pre-basic.service.in
index 69a406149d..e9df12c993 100644
--- a/units/breakpoint-pre-basic.service.in
+++ b/units/breakpoint-pre-basic.service.in
@@ -8,12 +8,13 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Breakpoint Before Basic System
+Description=Breakpoint Before basic.target
 Documentation=man:systemd-debug-generator(8)
 DefaultDependencies=no
+RefuseManualStart=yes
 Conflicts=shutdown.target emergency.target
 After=sysinit.target sockets.target paths.target slices.target tmp.mount systemd-vconsole-setup.service
-Before=basic.target
+Before=basic.target initrd-root-fs.target sysroot.mount shutdown.target emergency.target
 
 [Service]
 Environment=SHELL_PROMPT_PREFIX="pre-basic "
diff --git a/units/breakpoint-pre-mount.service.in b/units/breakpoint-pre-mount.service.in
index b50c780f01..55551dbbf2 100644
--- a/units/breakpoint-pre-mount.service.in
+++ b/units/breakpoint-pre-mount.service.in
@@ -8,13 +8,14 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Breakpoint Before Mounting the Root Filesystem on /sysroot
+Description=Breakpoint Before Mounting the Root Filesystem on /sysroot/
 Documentation=man:systemd-debug-generator(8)
 AssertPathExists=/etc/initrd-release
 DefaultDependencies=no
+RefuseManualStart=yes
 Conflicts=shutdown.target emergency.target
 After=basic.target systemd-vconsole-setup.service
-Before=initrd-root-fs.target sysroot.mount systemd-fsck-root.service
+Before=initrd-root-fs.target sysroot.mount systemd-fsck-root.service shutdown.target emergency.target
 
 [Service]
 Environment=SHELL_PROMPT_PREFIX="pre-mount "
diff --git a/units/breakpoint-pre-switch-root.service.in b/units/breakpoint-pre-switch-root.service.in
index 76eaa8039a..4c6334662c 100644
--- a/units/breakpoint-pre-switch-root.service.in
+++ b/units/breakpoint-pre-switch-root.service.in
@@ -12,10 +12,10 @@ Description=Breakpoint Before Switching Root
 Documentation=man:systemd-debug-generator(8)
 AssertPathExists=/etc/initrd-release
 DefaultDependencies=no
+RefuseManualStart=yes
 Conflicts=shutdown.target emergency.target
-Wants=remote-fs.target
-After=initrd.target initrd-parse-etc.service sysroot.mount remote-fs.target systemd-vconsole-setup.service
-Before=initrd-cleanup.service
+After=initrd.target initrd-parse-etc.service remote-fs.target systemd-vconsole-setup.service
+Before=initrd-cleanup.service shutdown.target emergency.target
 
 [Service]
 Environment=SHELL_PROMPT_PREFIX="pre-switch-root "
diff --git a/units/breakpoint-pre-udev.service.in b/units/breakpoint-pre-udev.service.in
index baf0e03351..6ef41e7ff9 100644
--- a/units/breakpoint-pre-udev.service.in
+++ b/units/breakpoint-pre-udev.service.in
@@ -11,10 +11,11 @@
 Description=Breakpoint Before Starting to Process Kernel uevents
 Documentation=man:systemd-debug-generator(8)
 DefaultDependencies=no
+RefuseManualStart=yes
 Conflicts=shutdown.target emergency.target
 Wants=systemd-journald.socket
 After=systemd-journald.socket systemd-vconsole-setup.service
-Before=systemd-udevd.service systemd-udev-trigger.service
+Before=systemd-udevd.service systemd-udev-trigger.service shutdown.target emergency.target
 
 [Service]
 Environment=SHELL_PROMPT_PREFIX="pre-udev "