From 287353c355d3617cd5bb4c0fecdaecfc169af7b7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 03 2016 18:32:13 +0000 Subject: Revert "Run preset-all on initial installation" This reverts commit 46083abe1a4de3328d84e4a32ee22c78ac414b03. preset-all really does not work right, disabling all sorts of stuff it should not disable. This caused RHBZ #1363858 (no tty on vt1) and probably broke other things too. --- diff --git a/systemd.spec b/systemd.spec index 5507dc9..d81b772 100644 --- a/systemd.spec +++ b/systemd.spec @@ -123,7 +123,8 @@ systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using -Linux cgroups, maintains mount and automount points, and implements an +Linux cgroups, supports snapshotting and restoring of the system +state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. %package libs @@ -387,10 +388,19 @@ if [ -e /etc/fstab ]; then sed -i.rpm.bak -r '/^devpts\s+\/dev\/pts\s+devpts\s+defaults\s+/d; /^tmpfs\s+\/dev\/shm\s+tmpfs\s+defaults\s+/d; /^sysfs\s+\/sys\s+sysfs\s+defaults\s+/d; /^proc\s+\/proc\s+proc\s+defaults\s+/d' /etc/fstab || : fi -# We reset the enablement of all services upon initial installation -# https://bugzilla.redhat.com/show_bug.cgi?id=1118740#c23 +# Services we install by default, and which are controlled by presets. if [ $1 -eq 1 ] ; then - systemctl preset-all &>/dev/null || : + systemctl preset \ + remote-fs.target \ + getty@.service \ + serial-getty@.service \ + console-getty.service \ + console-shell.service \ + debug-shell.service \ + systemd-networkd.service \ + systemd-networkd-wait-online.service \ + systemd-resolved.service \ + >/dev/null 2>&1 || : fi # sed-fu to add myhostanme to hosts line and remove mymachines