Author: baggins Date: Sun May 27 13:39:45 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- started update to 183
- restored /var/{lock,run} mounts
- remove tmpfs on /tmp mount
---- Files affected:
packages/systemd:
systemd.spec (1.156 -> 1.157) , var-lock.mount (NONE -> 1.1) (NEW),
var-run.mount (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.156 packages/systemd/systemd.spec:1.157
--- packages/systemd/systemd.spec:1.156 Wed May 23 11:28:00 2012
+++ packages/systemd/systemd.spec Sun May 27 15:39:40 2012
@@ -5,9 +5,6 @@
# /var/run directories
# - pldize vconsole setup:
# -
http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
-# - for systemd-45+
-# - restore var-{run,lock}:
http://cgit.freedesktop.org/systemd/systemd/commit/?id=55d029addf7d97b15faacea597a4ff65542aaf0e
-# - WARNING:
http://cgit.freedesktop.org/systemd/systemd/commit/?id=623ac9d2fce3170125ead9be20f56bfe68ea125e
#
# Conditional build:
%bcond_without audit # without audit support
@@ -20,16 +17,18 @@
Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
-Version: 44
-Release: 14
+Version: 183
+Release: 0.1
License: GPL v2+
Group: Base
Source0:
http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 11f44ff74c87850064e4351518bcff17
+# Source0-md5: e1e5e0f376fa2a4cb4bc31a2161c09f2
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
Source5: compat-pld-var-run.tmpfiles
+Source6: var-lock.mount
+Source7: var-run.mount
Source10: pld-storage-init-late.service
Source11: pld-storage-init.service
Source12: pld-wait-storage.service
@@ -100,6 +99,8 @@
# systemd scripts use options not present in older versions
Conflicts: kpartx < 0.4.9-7
Conflicts: multipath-tools < 0.4.9-7
+# no tmpfs on /media, use /run/media/$USER for mounting
+Conflicts: udisks2 < 1.92.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_prefix}/lib
@@ -391,6 +392,14 @@
# install compatibility tmpfiles configs
cp -p %{SOURCE5}
$RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+# restore bind-mounts /var/run -> run and /var/lock -> /run/lock
+# we don't have those directories symlinked
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/var-lock.mount
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/var-run.mount
+
+# and remove tmp on tmpfs mount
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/tmp.mount
+
# Install and enable storage subsystems support services (RAID, LVM, etc.)
cp -p %{SOURCE10}
$RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
@@ -786,6 +795,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157 2012/05/27 13:39:40 baggins
+- started update to 183
+- restored /var/{lock,run} mounts
+- remove tmpfs on /tmp mount
+
Revision 1.156 2012/05/23 09:28:00 baggins
- rel 14
- get rid of /media entries as we did in FHS.spec
================================================================
Index: packages/systemd/var-lock.mount
diff -u /dev/null packages/systemd/var-lock.mount:1.1
--- /dev/null Sun May 27 15:39:46 2012
+++ packages/systemd/var-lock.mount Sun May 27 15:39:40 2012
@@ -0,0 +1,19 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Lock Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/lock
+ConditionPathIsSymbolicLink=!/var/lock
+
+[Mount]
+What=/run/lock
+Where=/var/lock
+Type=bind
+Options=bind
================================================================
Index: packages/systemd/var-run.mount
diff -u /dev/null packages/systemd/var-run.mount:1.1
--- /dev/null Sun May 27 15:39:46 2012
+++ packages/systemd/var-run.mount Sun May 27 15:39:40 2012
@@ -0,0 +1,19 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Runtime Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/run
+ConditionPathIsSymbolicLink=!/var/run
+
+[Mount]
+What=/run
+Where=/var/run
+Type=bind
+Options=bind
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.156&r2=1.157
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
