diff options
Diffstat (limited to 'data/systemd')
| -rw-r--r-- | data/systemd/Makefile.am | 3 | ||||
| -rw-r--r-- | data/systemd/anaconda-cleanup-initramfs.service | 2 | ||||
| -rwxr-xr-x | data/systemd/anaconda-generator | 2 | ||||
| -rw-r--r-- | data/systemd/anaconda-tmux@.service | 15 | ||||
| -rw-r--r-- | data/systemd/anaconda.service (renamed from data/systemd/anaconda@.service) | 10 | ||||
| -rw-r--r-- | data/systemd/anaconda.target | 1 | ||||
| -rw-r--r-- | data/systemd/fedora-import-state | 14 | ||||
| -rw-r--r-- | data/systemd/fedora-import-state.service | 13 |
8 files changed, 22 insertions, 38 deletions
diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index 8579ece04..96bd8f0cb 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -20,8 +20,9 @@ systemddir = /lib/systemd/system generatordir = /lib/systemd/system-generators -dist_systemd_DATA = anaconda@.service \ +dist_systemd_DATA = anaconda.service \ anaconda.target \ + anaconda-tmux@.service \ anaconda-shell@.service \ instperf.service \ anaconda-sshd.service \ diff --git a/data/systemd/anaconda-cleanup-initramfs.service b/data/systemd/anaconda-cleanup-initramfs.service index 1d10bfc7a..cc493572d 100644 --- a/data/systemd/anaconda-cleanup-initramfs.service +++ b/data/systemd/anaconda-cleanup-initramfs.service @@ -1,6 +1,6 @@ [Unit] Description=Clean Up Initramfs -Before=anaconda@.service +Before=anaconda.service ConditionPathIsDirectory=/run/initramfs/usr/lib/modules [Service] diff --git a/data/systemd/anaconda-generator b/data/systemd/anaconda-generator index cb4704023..71e35e718 100755 --- a/data/systemd/anaconda-generator +++ b/data/systemd/anaconda-generator @@ -25,7 +25,7 @@ done consoletty="$tty" # put anaconda on the real console -service_on_tty anaconda@.service $consoletty +service_on_tty anaconda-tmux@.service $consoletty # put a shell on tty2 and the first virtualization console we find for tty in tty2 hvc0 hvc1 xvc0 hvsi0 hvsi1 hvsi2; do diff --git a/data/systemd/anaconda-tmux@.service b/data/systemd/anaconda-tmux@.service new file mode 100644 index 000000000..0b8376588 --- /dev/null +++ b/data/systemd/anaconda-tmux@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Anaconda Text Console +Requires=anaconda.service +After=anaconda.target anaconda.service + +[Service] +Type=simple +WorkingDirectory=/root +Environment=LANG=en_US.UTF-8 +ExecStartPre=/usr/bin/echo -e \033%G +ExecStart=/usr/bin/tmux -u attach -t anaconda +StandardInput=tty-force +TTYPath=/dev/%I +TTYReset=yes +Restart=always diff --git a/data/systemd/anaconda@.service b/data/systemd/anaconda.service index 03ecabb17..5629e00a8 100644 --- a/data/systemd/anaconda@.service +++ b/data/systemd/anaconda.service @@ -3,11 +3,7 @@ Description=Anaconda After=anaconda.target [Service] -Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin -Type=oneshot +Type=forking +Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin LANG=en_US.UTF-8 WorkingDirectory=/root -ExecStart=/usr/sbin/anaconda -StandardInput=tty-force -TTYPath=/dev/%I -TTYReset=yes -TimeoutSec=0 +ExecStart=/usr/bin/tmux -u -f /etc/anaconda-tmux.conf start diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target index 9a95c6615..597adfde3 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -3,7 +3,6 @@ Description=Anaconda System Services Requires=basic.target After=basic.target AllowIsolate=yes -Before=anaconda@.service Wants=anaconda-cleanup-initramfs.service Wants=instperf.service Wants=rsyslog.service diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state deleted file mode 100644 index a853ab9cd..000000000 --- a/data/systemd/fedora-import-state +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# fedora-import-state: import state files from initramfs (e.g. network config) - -# exit early if root isn't writeable -[ -w / ] || exit 0 - -# copy state into root -cd /run/initramfs/state -cp -a -t / . - -# run restorecon on the copied files -if [ -e /sys/fs/selinux/enforce ]; then - find . | ( cd /; restorecon -i -f -; ) || : -fi diff --git a/data/systemd/fedora-import-state.service b/data/systemd/fedora-import-state.service deleted file mode 100644 index 5294fe172..000000000 --- a/data/systemd/fedora-import-state.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Import network configuration from initramfs -DefaultDependencies=no -ConditionDirectoryNotEmpty=/run/initramfs/state -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service -After=remount-rootfs.service - -[Service] -ExecStart=/lib/systemd/fedora-import-state -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes |