Kay Sievers 2010-08-19 13:15:56 +00:00 committed by Git OBS Bridge
parent 16698d270f
commit f837c50170
3 changed files with 41 additions and 14 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d5ba7f86cbc92ed614230baae34034cefd6830ead204ab9df7d51eded3fd37a
size 650968
oid sha256:23013686f88c91b3c1298d6d20630c4b063030b922cbb74098e20e123823c820
size 652241

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 17 22:54:41 CEST 2010 - kay.sievers@novell.com
- prefix sysv job descriptions with LSB:
- add native sysctl + hwclock + random seed service files
- properly fallback to rescue.target if default.target is hosed
- rename ValidNoProcess= to RemainAfterExit=
- add systemd-modules-load tool to handle /etc/modules.d/
-------------------------------------------------------------------
Tue Aug 17 09:01:04 CEST 2010 - kay.sievers@novell.com

View File

@ -99,6 +99,10 @@ ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
rm -rf $RPM_BUILD_ROOT/etc/systemd/system/*.target.wants
rm -f $RPM_BUILD_ROOT/etc/systemd/system/default.target
mkdir -p $RPM_BUILD_ROOT/etc/modules.d
# alias for /etc/init.d/*
ln -s hwclock-load.service $RPM_BUILD_ROOT/lib/systemd/system/clock.service
ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service
%pre
# kernel changes are pending to move this to /sys/fs/cgroup
@ -117,25 +121,38 @@ if [ "$1" -eq 1 ]; then
fi
/bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || :
# Enable these services by default.
/bin/systemctl enable getty@.service >/dev/null 2>&1 || :
/bin/systemctl enable getty.target >/dev/null 2>&1 || :
/bin/systemctl enable remote-fs.target >/dev/null 2>&1 || :
/bin/systemctl enable var-run.service >/dev/null 2>&1 || :
/bin/systemctl enable var-lock.service >/dev/null 2>&1 || :
/bin/systemctl enable \
getty@.service \
getty.target \
remote-fs.target \
hwclock-save.service \
sysctl.service \
systemd-random-seed-load.service \
systemd-random-seed-save.service \
systemd-modules-load.service \
var-run.service \
var-lock.service >/dev/null 2>&1 || :
fi
# Make sure we always enable these basic services, in case something went
# wrong at the time these packages got installed. Usual systems can not
# properly work without these services.
/bin/systemctl enable udev.service >/dev/null 2>&1 || :
/bin/systemctl enable dbus.service >/dev/null 2>&1 || :
/bin/systemctl enable \
udev.service \
dbus.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ]; then
/bin/systemctl disable getty@.service >/dev/null 2>&1 || :
/bin/systemctl disable getty.target >/dev/null 2>&1 || :
/bin/systemctl disable remote-fs.target >/dev/null 2>&1 || :
/bin/systemctl disable var-run.service >/dev/null 2>&1 || :
/bin/systemctl disable var-lock.service >/dev/null 2>&1 || :
/bin/systemctl disable \
getty@.service \
getty.target \
remote-fs.target \
hwclock-save.service \
sysctl.service \
systemd-random-seed-load.service \
systemd-random-seed-save.service \
systemd-modules-load.service \
var-run.service \
var-lock.service >/dev/null 2>&1 || :
rm -f /etc/systemd/system/default.target 2>&1 || :
fi
@ -153,6 +170,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/systemd/session
%dir %{_sysconfdir}/xdg/systemd/session
%dir %{_sysconfdir}/modules.d
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target
%config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target