[systemd] new release
Lennart Poettering
lennart at fedoraproject.org
Thu Nov 25 00:16:47 UTC 2010
commit d9a10944bf24bd3d89b2c422acdf2dfe1a29fd85
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Nov 25 01:16:40 2010 +0100
new release
.gitignore | 1 +
sources | 2 +-
systemd.spec | 24 +++++++++++++++++-------
3 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e024045..8944d17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ systemd-7.tar.bz2
/systemd-11.tar.bz2
/systemd-12.tar.bz2
/systemd-13.tar.bz2
+/systemd-14.tar.bz2
diff --git a/sources b/sources
index 1c1b470..123aa06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86e2909e025477ceda3fdd96b932f18a systemd-13.tar.bz2
+936db9cb28903bdd1b1dcb7aea238107 systemd-14.tar.bz2
diff --git a/systemd.spec b/systemd.spec
index 8e915fd..0972721 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,7 +1,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Version: 13
+Version: 14
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
@@ -31,6 +31,7 @@ Requires: initscripts >= 9.22
Requires: selinux-policy >= 3.8.7
Requires: kernel >= 2.6.35.2-9.fc14
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
+Source1: console.conf
# For sysvinit tools
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -40,6 +41,8 @@ Obsoletes: systemd-sysvinit
Obsoletes: upstart < 0.6.5-9
Obsoletes: upstart-sysvinit < 0.6.5-9
Conflicts: upstart-sysvinit
+Obsoletes: readahead < 1.5.7-3
+Provides: readahead = 1.5.7-3
%description
systemd is a system and service manager for Linux, compatible with
@@ -99,10 +102,6 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
# them.
rm -r %{buildroot}/etc/systemd/system/*.target.wants
-# We haven't updated Fedora for tmpfs on /var/run and /var/lock yet
-rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-run.mount
-rm %{buildroot}/lib/systemd/system/local-fs.target.wants/var-lock.mount
-
# Make sure the %ghost-ing below works
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
@@ -115,6 +114,8 @@ mkdir -p %{buildroot}/lib/systemd/system/default.target.wants
mkdir -p %{buildroot}/lib/systemd/system/dbus.target.wants
mkdir -p %{buildroot}/lib/systemd/system/syslog.target.wants
+install -m 644 -p $RPM_SOURCE_DIR/console.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/console.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -142,7 +143,8 @@ if [ $1 -eq 1 ] ; then
quotaon.service \
quotacheck.service \
systemd-readahead-replay.service \
- systemd-readahead-collect.service > /dev/null 2>&1 || :
+ systemd-readahead-collect.service \
+ hwclock-load.service > /dev/null 2>&1 || :
fi
%preun units
@@ -154,7 +156,8 @@ if [ $1 -eq 0 ] ; then
quotaon.service \
quotacheck.service \
systemd-readahead-replay.service \
- systemd-readahead-collect.service > /dev/null 2>&1 || :
+ systemd-readahead-collect.service \
+ hwclock-load.service > /dev/null 2>&1 || :
/bin/rm -f /etc/systemd/system/default.target > /dev/null 2>&1 || :
fi
@@ -172,6 +175,7 @@ fi
%{_sysconfdir}/xdg/systemd
%{_sysconfdir}/tmpfiles.d/systemd.conf
%{_sysconfdir}/tmpfiles.d/x11.conf
+%{_sysconfdir}/tmpfiles.d/console.conf
/bin/systemd
/bin/systemd-notify
/bin/systemd-ask-password
@@ -229,6 +233,12 @@ fi
%{_mandir}/man1/systemadm.*
%changelog
+* Thu Nov 25 2010 Lennart Poettering <lpoetter at redhat.com> - 14-1
+- Upstream update
+- Enable hwclock-load by default
+- Obsolete readahead
+- Enable /var/run and /var/lock on tmpfs
+
* Fri Nov 19 2010 Lennart Poettering <lpoetter at redhat.com> - 13-1
- new upstream release
More information about the scm-commits
mailing list