Kay Sievers 2010-09-22 12:27:25 +00:00 committed by Git OBS Bridge
parent 0d0597ca27
commit e95d7e4eb0
3 changed files with 22 additions and 27 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be67ba1aa0e4c24ea0b9af9a4b9a6edf8e1f339ff039c11f392799167619dc90
size 678772
oid sha256:dde1144e7ac56da7c022dd1aefe3587c70e92fe8c393039cbf1f02269f8f2265
size 680700

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com
- new snapshot
- basic services are enabled by default now
-------------------------------------------------------------------
Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com
- new snapshot
- vconsole and locale setup
- hook up tmpwatch
-------------------------------------------------------------------
Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com

View File

@ -36,6 +36,9 @@ BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel
BuildRequires: libselinux-devel libsepol-devel
Requires: udev >= 162
Requires: dbus-1 >= 1.4.0
Requires: kbd
Requires: util-linux
Requires: tmpwatch
Conflicts: mkinitrd < 2.6.0-5
Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2
Source1: systemd-rpmlintrc
@ -112,39 +115,20 @@ ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random
if [ "$1" -eq 1 ]; then
# Try to read default runlevel from the old inittab if it exists
runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
if [ -z "$runlevel" ] ; then
target="/lib/systemd/system/graphical.target"
else
target="/lib/systemd/system/runlevel$runlevel.target"
if [ -n "$runlevel" ] ; then
/bin/ln -sf /lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || :
fi
/bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || :
# Enable these services by default.
/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 || :
remote-fs.target >/dev/null 2>&1 || :
fi
%preun
if [ $1 -eq 0 ]; then
/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 || :
remote-fs.target >/dev/null 2>&1 || :
rm -f /etc/systemd/system/default.target 2>&1 || :
fi
@ -165,8 +149,6 @@ rm -rf $RPM_BUILD_ROOT
%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
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service