rpms/systemd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Run preset-all on initial installation"

Browse Source 
This reverts commit 46083abe1a.
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.
This commit is contained in:
Adam Williamson 2016-08-03 11:32:13 -07:00
parent 140d00ebaa
commit 287353c355
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
systemd.spec
View File

@ -123,7 +123,8 @@ systemd is a system and service manager for Linux, compatible with
SysV and LSB init scripts. systemd provides aggressive parallelization SysV and LSB init scripts. systemd provides aggressive parallelization
capabilities, uses socket and D-Bus activation for starting services, capabilities, uses socket and D-Bus activation for starting services,
offers on-demand starting of daemons, keeps track of processes using 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. elaborate transactional dependency-based service control logic.
%package libs %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 || : 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 fi
# We reset the enablement of all services upon initial installation # Services we install by default, and which are controlled by presets.
# https://bugzilla.redhat.com/show_bug.cgi?id=1118740#c23
if [ $1 -eq 1 ] ; then 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 fi
# sed-fu to add myhostanme to hosts line and remove mymachines # sed-fu to add myhostanme to hosts line and remove mymachines