[PATCH 04/10] backports: blacklist.sh: support install root not in /

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Samuel Martin <s.martin49@xxxxxxxxx>
---
 backport/Makefile.real        | 2 +-
 backport/scripts/blacklist.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backport/Makefile.real b/backport/Makefile.real
index f60d5ca..5a25db4 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -92,7 +92,7 @@ install: modules
 	@$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD)			\
 		INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG)		\
 		modules_install
-	@./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
+	@./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) $(KROOT)
 	@./scripts/compress_modules.sh $(KLIB)/$(KMODDIR)
 	@./scripts/check_depmod.sh
 	@/sbin/depmod -a
diff --git a/backport/scripts/blacklist.sh b/backport/scripts/blacklist.sh
index f941c4a..f995f11 100755
--- a/backport/scripts/blacklist.sh
+++ b/backport/scripts/blacklist.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-BLACKLIST_CONF="/etc/modprobe.d/backports.conf"
-BLACKLIST_MAP=".blacklist.map"
-
 MODULE_DIR=$1
 MODULE_UPDATES=$2
+KROOT=$3
+
+BLACKLIST_CONF="$KROOT/etc/modprobe.d/backports.conf"
+BLACKLIST_MAP=".blacklist.map"
 
 if [[ ! -d $MODULE_DIR ]]; then
 	exit
-- 
1.9.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux