Re: [patch] automatically install correct initscript

[Robert Love <rml@ximian.com>]

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.

	Robert Love


 Makefile  |   17 ++++++++++-------
 TODO      |    1 - 
 udev.spec |   10 ----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff -urN udev-019/Makefile udev/Makefile
--- udev-019/Makefile	2004-02-27 20:11:47.000000000 -0500
+++ udev/Makefile	2004-03-01 20:07:20.509296424 -0500
@@ -341,6 +341,15 @@
 	-
 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 \
@@ -356,7 +365,7 @@
 		$(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)
@@ -364,12 +373,6 @@
 	$(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
diff -urN udev-019/TODO udev/TODO
--- udev-019/TODO	2004-03-01 19:44:47.457991488 -0500
+++ udev/TODO	2004-03-01 19:44:38.682325592 -0500
@@ -7,7 +7,6 @@
 
 
 - 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
diff -urN udev-019/udev.spec udev/udev.spec
--- udev-019/udev.spec	2004-02-27 20:11:47.000000000 -0500
+++ udev/udev.spec	2004-03-01 20:22:36.516042232 -0500
@@ -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 @@
 %else
 	USE_SELINUXúlse	\
 %endif
-%if %{lsb}
-	USE_LSB=true		\
-%else
-	USE_LSBúlse		\
-%endif
 	EXTRAS="	\
 %if %{scsi_id}
 	extras/scsi_id	\




-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id\x1356&alloc_id438&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel