Drop udev migration code from pre-wheezy

This commit is contained in:
Michael Biebl 2015-05-31 00:43:51 +02:00
parent 0ee61e098c
commit e2b294170e
3 changed files with 2 additions and 27 deletions

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ systemd (220-4) UNRELEASED; urgency=medium
* Stop using /sbin/udevd and drop the compat symlink.
* Remove any vestiges of /dev/.udev/. This directory has been replaced by
/run/udev/ since wheezy.
* Drop udev migration code from pre-wheezy.
-- Martin Pitt <mpitt@debian.org> Mon, 01 Jun 2015 15:12:34 +0200

View File

@ -96,15 +96,6 @@ write_interfaces_rules() {
}
upgrade_fixes() {
if dpkg --compare-versions "$2" lt "171-3"; then
# in 171-2 this directory becomes a symlink to libudev0, so it must be
# manually deleted because dpkg cannot automatically deal with this
if [ -e /usr/share/doc/udev -a ! -L /usr/share/doc/udev ]; then
rm -rf /usr/share/doc/udev
ln -s libudev0 /usr/share/doc/udev
fi
fi
if dpkg --compare-versions "$2" lt "204-1"; then
# We dropped udev-mtab with udev 204.
update-rc.d udev-mtab remove

19
debian/udev.preinst vendored
View File

@ -209,15 +209,6 @@ mask_systemd_service() {
fi
}
stop_on_upstart_upgrade() {
if which initctl >/dev/null && initctl version | grep -q upstart
then
# We have to stop udev before we can restart it under upstart in the
# postinst.
invoke-rc.d udev stop
fi
}
check_version() {
# $2 is non-empty when installing from the "config-files" state
[ "$2" ] || return 0
@ -230,15 +221,7 @@ check_version() {
check_kernel_version
check_kernel_features
fi
fi # 168-2
if dpkg --compare-versions $2 lt 175-1; then
rm_conffile /etc/modprobe.d/blacklist.conf
fi # 175-1
if dpkg --compare-versions $2 lt 175-7.1; then
stop_on_upstart_upgrade
fi # 175-7.1
fi # 204-4
if dpkg --compare-versions $2 lt 204-4; then
# suppress errors when the new rules files contain options not supported by