chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
66a9021
)
[PATCH] remove the .udev.tdb when installing or uninstalling to be safe.
author
greg@kroah.com
<greg@kroah.com>
Fri, 13 Feb 2004 07:20:50 +0000
(23:20 -0800)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 04:32:27 +0000
(21:32 -0700)
Makefile
patch
|
blob
|
history
etc/init.d/udev
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index cb9dfdd3d8611e7aa054aa10ec30689217ae4b7b..2ecfd3a9680dc18374624a8b3b06cfa5925882fe 100644
(file)
--- 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
$(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 ; \
- 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 $(sbindir)/$(HELPER)
- rmdir $(hotplugdir)
- rmdir $(configdir)
+ - rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
diff --git
a/etc/init.d/udev
b/etc/init.d/udev
index 437556c3fb964a8448cb2380124e36ade1c76018..8a29f1197566449c011e32932933287248dc330c 100644
(file)
--- 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
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
.t
db ]; then
+ rm -f $udev_root/.udev
.t
db
fi
# propogate /udev from /sys - we only need this while we do not
fi
# propogate /udev from /sys - we only need this while we do not