diff options
| author | rml@ximian.com <rml@ximian.com> | 2004-03-02 20:27:53 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:35:07 -0700 |
| commit | c58f8c3000b99db5c3810b9f8b1ecc2044070ac1 (patch) | |
| tree | acb7acddd1fe34ce893bd706692fa44cdfb3f168 | |
| parent | 5ec4899acf4338fec32f8f8c218802a406319971 (diff) | |
[PATCH] automatically install correct initscript
On Mon, 2004-03-01 at 20:08, Robert Love wrote:
> Ack, I did not even see that! Thanks.
>
> Let's rip that out, and always use the new built-in logic to determine
> what initscript to install.
Hm, looks like we do not need the %{lsb} and USE_LSB logic at all,
anymore.
Here is the patch, updated, removing both completely.
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | udev.spec | 10 |
3 files changed, 10 insertions, 18 deletions
@@ -347,6 +347,15 @@ uninstall-dbus-policy: - endif +install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB + @if [ -f /etc/redhat-release ]; then \ + $(INSTALL_DATA) etc/init.d/udev $(etcdir)/init.d/udev; \ + elif [ -f /etc/SuSE-release ]; then \ + $(INSTALL_DATA) etc/init.d/udev.init.LSB $(etcdir)/init.d/udev; \ + elif [ -f /etc/debian_version ]; then \ + $(INSTALL_DATA) etc/init.d/udev.debian $(etcdir)/init.d/udev; \ + fi + install-config: $(GEN_CONFIGS) $(INSTALL) -d $(DESTDIR)$(configdir) @if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \ @@ -362,7 +371,7 @@ install-config: $(GEN_CONFIGS) $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \ fi -install: install-config install-dbus-policy all +install: install-initscript install-config install-dbus-policy all $(INSTALL) -d $(DESTDIR)$(udevdir) $(INSTALL) -d $(DESTDIR)$(hotplugdir) $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT) @@ -370,12 +379,6 @@ install: install-config install-dbus-policy all $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER) $(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER) $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(sbindir)/$(TESTER) - @if [ "x$(USE_LSB)" = "xtrue" ]; then \ - $(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \ - ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \ - else \ - $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \ - fi $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8 $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8 $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8 @@ -7,7 +7,6 @@ greg@kroah.com - more documentation (can never have too much.) -- install the proper init.d script based on the distro we are running on. - persuade the distro packagers to submit their changes (or just steal them if we can find them...) - create kernel name to devfs name config file so that all of the devfs users @@ -27,11 +27,6 @@ # 1 - debugging enabled %define debug 0 -# if we want to use the LSB version of the init script or the Redhat one -# 0 - use Redhat: etc/init.d/udev -# 1 - use LSB: etc/init.d/udev.init.LSB -%define lsb 0 - # if we want to build the scsi_id "extra" package or not # 0 - do not build the package # 1 - build it @@ -100,11 +95,6 @@ make DESTDIR=$RPM_BUILD_ROOT install \ %else USE_SELINUX=false \ %endif -%if %{lsb} - USE_LSB=true \ -%else - USE_LSB=false \ -%endif EXTRAS=" \ %if %{scsi_id} extras/scsi_id \ |