summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-02-12 23:20:50 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:32:27 -0700
commit552a4d426f24364a13d92a31bafdb37649fcb0f1 (patch)
treef52a2d1831d4b9f8a09104835a5453e20b14740b
parent66a90217605c149fe06f3edf0f3c491f28e640b6 (diff)
[PATCH] remove the .udev.tdb when installing or uninstalling to be safe.
-rw-r--r--Makefile2
-rw-r--r--etc/init.d/udev4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cb9dfdd3d8..2ecfd3a968 100644
--- a/Makefile
+++ b/Makefile
@@ -361,6 +361,7 @@ install: install-config install-dbus-policy all
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
- rm -f $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
+ - rm -f $(udevdir)/.udev.tdb
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@ -382,6 +383,7 @@ uninstall: uninstall-dbus-policy
- rm $(sbindir)/$(HELPER)
- rmdir $(hotplugdir)
- rmdir $(configdir)
+ - rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
diff --git a/etc/init.d/udev b/etc/init.d/udev
index 437556c3fb..8a29f11975 100644
--- a/etc/init.d/udev
+++ b/etc/init.d/udev
@@ -51,8 +51,8 @@ case "$1" in
fi
# remove the database if it is there as we always want to start fresh
- if [ -f $udev_root/.udevdb ]; then
- rm -f $udev_root/.udevdb
+ if [ -f $udev_root/.udev.tdb ]; then
+ rm -f $udev_root/.udev.tdb
fi
# propogate /udev from /sys - we only need this while we do not