diff options
| author | Roy Marples <roy@marples.name> | 2008-03-27 19:55:03 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-27 19:55:03 +0000 |
| commit | 5e8ed2aecabf48895e6d3d090591ffb59fc7588b (patch) | |
| tree | 834f5833aa5ac66d4c028314df2638d9607a9bec | |
| parent | 742310744d61a2bc2553f8c34aededf30fea3f18 (diff) | |
Tweak install of runlevels.
| -rw-r--r-- | runlevels/Makefile | 7 | ||||
| -rw-r--r-- | runlevels/Makefile.Linux | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/runlevels/Makefile b/runlevels/Makefile index 4a7ba5fc..41ba12b0 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 f9a32044..31b48621 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 |