Commit 2b8f4caf authored by Michael Biebl's avatar Michael Biebl Committed by Tollef Fog Heen
Browse files

Stop installing lib-init-rw (auto)mount units

and try to cleanup /lib/init/rw in postinst. Bump dependency on
initscripts accordingly. Closes: #643699
parent 655aeeba
......@@ -28,6 +28,9 @@ systemd (43-1) unstable; urgency=low
* Avoid error messages from systemctl in postinst if systemd is not running
by checking for /sys/fs/cgroup/systemd before executing systemctl.
Closes: #642749
* Stop installing lib-init-rw (auto)mount units and try to cleanup
/lib/init/rw in postinst. Bump dependency on initscripts accordingly.
Closes: #643699
-- Tollef Fog Heen <tfheen@debian.org> Tue, 07 Feb 2012 21:36:34 +0100
......
......@@ -39,7 +39,7 @@ Section: admin
Priority: extra
Recommends: libpam-systemd
Suggests: systemd-gui, python
Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.19.1-2), initscripts (>= 2.88dsf-13.3), udev
Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.19.1-2), initscripts (>= 2.88dsf-17), udev
Breaks: lvm2 (<< 2.02.84-1)
Conflicts: klogd
Description: system and service manager
......
# 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=Debian early rw Automount Point
DefaultDependencies=no
Before=basic.target
ConditionPathIsDirectory=/lib/init/rw
[Automount]
Where=/lib/init/rw
[Unit]
Description=Debian early rw mount
DefaultDependencies=no
ConditionPathIsDirectory=/lib/init/rw
[Mount]
What=tmpfs
Where=/lib/init/rw
Type=tmpfs
Options=mode=0755,nosuid
......@@ -39,7 +39,5 @@ usr/lib/sysctl.d
usr/lib/systemd
usr/lib/tmpfiles.d
debian/init-functions lib/lsb
debian/lib-init-rw.automount lib/systemd/system/
debian/lib-init-rw.mount lib/systemd/system/
debian/debian-fixup lib/systemd/
debian/debian-fixup.service lib/systemd/system
......@@ -40,6 +40,13 @@ EOF
fi
fi
if dpkg --compare-versions "$2" lt "40-1"; then
# /lib/init/rw has been replaced by /run, so try to remove it on upgrades
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643699
_systemctl stop lib-init-rw.automount lib-init-rw.mount || true
rmdir --ignore-fail-on-non-empty /lib/init/rw || true
fi
systemd-machine-id-setup
dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment