SVN: geninitrd/trunk: Makefile geninitrd

glen glen at pld-linux.org
Tue Mar 3 10:32:38 CET 2009


Author: glen
Date: Tue Mar  3 10:32:37 2009
New Revision: 10165

Modified:
   geninitrd/trunk/Makefile
   geninitrd/trunk/geninitrd
Log:
- use /lib/geninitrd instead of /etc for modules/functions code

Modified: geninitrd/trunk/Makefile
==============================================================================
--- geninitrd/trunk/Makefile	(original)
+++ geninitrd/trunk/Makefile	Tue Mar  3 10:32:37 2009
@@ -5,18 +5,18 @@
 prefix		:= /usr
 mandir		:= $(prefix)/share/man
 sbindir		:= /sbin
-sysconfdir	:= /etc/geninitrd
+libdir		:= /lib/geninitrd
 sysconfigdir := /etc/sysconfig
 
 all: geninitrd.8
 
 install:
-	install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfigdir)
+	install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(libdir) $(DESTDIR)$(sysconfigdir)
 	install geninitrd $(DESTDIR)$(sbindir)/geninitrd
 	install -m644 geninitrd.8 $(DESTDIR)$(mandir)/man8/geninitrd.8
-	install -m644 functions $(DESTDIR)$(sysconfdir)/functions
+	install -m644 functions $(DESTDIR)$(libdir)/functions
 	for mod in $(MODS); do \
-		install -m644 $$mod $(DESTDIR)$(sysconfdir); \
+		install -m644 $$mod $(DESTDIR)$(libdir); \
 	done
 	install -m644 geninitrd.sysconfig $(DESTDIR)$(sysconfigdir)/geninitrd
 

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Mar  3 10:32:37 2009
@@ -16,7 +16,7 @@
 PROGRAM=${0##*/}
 
 . /etc/rc.d/init.d/functions
-. /etc/geninitrd/functions
+. /lib/geninitrd/functions
 . /etc/sysconfig/system
 
 COMPRESS=yes
@@ -1219,15 +1219,15 @@
 fi
 
 # ide addon
-. /etc/geninitrd/mod-ide.sh
+. /lib/geninitrd/mod-ide.sh
 # cryptsetup luks addon
-. /etc/geninitrd/mod-luks.sh
+. /lib/geninitrd/mod-luks.sh
 # dm-multipath addon
-. /etc/geninitrd/mod-multipath.sh
+. /lib/geninitrd/mod-multipath.sh
 # dmraid addon
-. /etc/geninitrd/mod-dmraid.sh
+. /lib/geninitrd/mod-dmraid.sh
 # LVM addon
-. /etc/geninitrd/mod-lvm.sh
+. /lib/geninitrd/mod-lvm.sh
 
 if [ -x /sbin/initrd-blkid ]; then
 	USE_BLKID=yes


More information about the pld-cvs-commit mailing list