From 5e8ed2aecabf48895e6d3d090591ffb59fc7588b Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 27 Mar 2008 19:55:03 +0000
Subject: Tweak install of runlevels.

---
 runlevels/Makefile       | 7 +++++--
 runlevels/Makefile.Linux | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'runlevels')

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 4a7ba5f..41ba12b 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -6,6 +6,8 @@ LEVELDIR=	${DESTDIR}/${SYSCONFDIR}/runlevels
 BOOTDIR=	${LEVELDIR}/boot
 DEFAULTDIR=	${LEVELDIR}/default
 
+INITDIR=	../init.d
+
 MK=		../mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
@@ -19,7 +21,8 @@ install:
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
 		for x in ${BOOT}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${SYSCONFDIR}/init.d/"$$x" && continue; \
+				test "$$x" = "net.lo" -o "$$x" = "net.lo0" && continue; \
+				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
 			fi; \
 			ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
 		done \
@@ -28,7 +31,7 @@ install:
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
 		for x in ${DEFAULT}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${SYSCONFDIR}/init.d/"$$x" && continue; \
+				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
 			fi; \
 			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
 	fi
diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux
index f9a3204..31b4862 100644
--- a/runlevels/Makefile.Linux
+++ b/runlevels/Makefile.Linux
@@ -1,3 +1,2 @@
 BOOT+=		hwclock consolefont keymaps modules mtab net.lo procfs \
 		termencoding
-DEFAULT+=	hdparm
-- 
cgit v1.2.3