[email protected]: do not exit as error when preventing restart

canonical · Jan 20, 2025 · 59a2f05 · 59a2f05
1 parent a75099e
commit 59a2f05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/bin/console-conf-check-error b/bin/console-conf-check-error
@@ -2,6 +2,6 @@
 
 set -eu
 
-if [ "${SERVICE_RESULT}" == "exit-code" ] && [ "${EXIT_STATUS}" -eq 22 ]; then
+if [ "${SERVICE_RESULT}" == "success" ] && [ "${EXIT_STATUS}" -eq 22 ]; then
   systemctl start --no-block "${1}"
 fi
diff --git a/debian/[email protected] b/debian/[email protected]
@@ -17,6 +17,7 @@ Conflicts=getty@%i.service
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStart=/sbin/agetty -i -n --noclear -l /usr/share/subiquity/console-conf-wrapper %I $TERM
 RestartPreventExitStatus=22
+SuccessExitStatus=22
 ExecStopPost=/usr/share/subiquity/console-conf-check-error getty@%i.service
 Type=idle
 OnFailure=getty@%i.service

diff --git a/debian/[email protected] b/debian/[email protected]
@@ -16,6 +16,7 @@ Conflicts=serial-getty@%i.service
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStart=/sbin/agetty -i -n --keep-baud -l /usr/share/subiquity/console-conf-wrapper --login-options "--serial" 115200,38400,9600 %I $TERM
 RestartPreventExitStatus=22
+SuccessExitStatus=22
 ExecStopPost=/usr/share/subiquity/console-conf-check-error serial-getty@%i.service
 Type=idle
 Restart=always