DistroBaker 93d277
From 5f066c4125d7a648958b31b909934e02cf397db8 Mon Sep 17 00:00:00 2001
DistroBaker 93d277
From: Jiri Konecny <jkonecny@redhat.com>
DistroBaker 93d277
Date: Mon, 8 Feb 2021 11:27:26 +0100
DistroBaker 93d277
Subject: [PATCH 2/3] Revert "Do not support no inst. Anaconda boot args in
DistroBaker 93d277
 systemd services (#1912502)" (#1907566)
DistroBaker 93d277
DistroBaker 93d277
Allow to use Anaconda kernel boot arguments systemd units to not break beaker.
DistroBaker 93d277
Beaker needs more time to adaptation so avoid to break it for RHEL-9.
DistroBaker 93d277
DistroBaker 93d277
This reverts commit 322e6a847d73ea17fe99aaae4129e14409488b6b.
DistroBaker 93d277
Related: rhbz#1907566
DistroBaker 93d277
---
DistroBaker 93d277
 data/systemd/anaconda-noshell.service | 1 +
DistroBaker 93d277
 data/systemd/anaconda-shell@.service  | 1 +
DistroBaker 93d277
 data/systemd/anaconda-sshd.service    | 2 ++
DistroBaker 93d277
 3 files changed, 4 insertions(+)
DistroBaker 93d277
DistroBaker 93d277
diff --git a/data/systemd/anaconda-noshell.service b/data/systemd/anaconda-noshell.service
DistroBaker 93d277
index ca4dbd328d..f378c67b0c 100644
DistroBaker 93d277
--- a/data/systemd/anaconda-noshell.service
DistroBaker 93d277
+++ b/data/systemd/anaconda-noshell.service
DistroBaker 93d277
@@ -3,6 +3,7 @@ Description=Restrict Anaconda Text Console
DistroBaker 93d277
 After=anaconda.service
DistroBaker 93d277
 Before=anaconda-tmux@.service
DistroBaker 93d277
 ConditionKernelCommandLine=|inst.noshell
DistroBaker 93d277
+ConditionKernelCommandLine=|noshell
DistroBaker 93d277
 
DistroBaker 93d277
 [Service]
DistroBaker 93d277
 Type=oneshot
DistroBaker 93d277
diff --git a/data/systemd/anaconda-shell@.service b/data/systemd/anaconda-shell@.service
DistroBaker 93d277
index b0dd4b7c66..bc69fd1208 100644
DistroBaker 93d277
--- a/data/systemd/anaconda-shell@.service
DistroBaker 93d277
+++ b/data/systemd/anaconda-shell@.service
DistroBaker 93d277
@@ -3,6 +3,7 @@
DistroBaker 93d277
 [Unit]
DistroBaker 93d277
 Description=Shell on %I
DistroBaker 93d277
 After=systemd-user-sessions.service plymouth-quit-wait.service
DistroBaker 93d277
+ConditionKernelCommandLine=!noshell
DistroBaker 93d277
 ConditionKernelCommandLine=!inst.noshell
DistroBaker 93d277
 
DistroBaker 93d277
 [Service]
DistroBaker 93d277
diff --git a/data/systemd/anaconda-sshd.service b/data/systemd/anaconda-sshd.service
DistroBaker 93d277
index 8b5b16fbbe..8cba2c4bb0 100644
DistroBaker 93d277
--- a/data/systemd/anaconda-sshd.service
DistroBaker 93d277
+++ b/data/systemd/anaconda-sshd.service
DistroBaker 93d277
@@ -3,8 +3,10 @@ Description=OpenSSH server daemon
DistroBaker 93d277
 Before=anaconda.target
DistroBaker 93d277
 After=syslog.target network.target sshd-keygen.target
DistroBaker 93d277
 Wants=sshd-keygen.target
DistroBaker 93d277
+ConditionKernelCommandLine=|sshd
DistroBaker 93d277
 ConditionKernelCommandLine=|inst.sshd
DistroBaker 93d277
 ConditionKernelCommandLine=!inst.sshd=0
DistroBaker 93d277
+ConditionKernelCommandLine=!sshd=0
DistroBaker 93d277
 # TODO: use ConditionArchitecture in systemd v210 or later
DistroBaker 93d277
 ConditionPathIsDirectory=|/sys/hypervisor/s390
DistroBaker 93d277
 
DistroBaker 93d277
-- 
DistroBaker 93d277
2.29.2
DistroBaker 93d277