From 57b18349e7a912e60f0a72a807b3d56f49c05e63 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 1 Jun 2011 08:36:05 -0400 Subject: [PATCH] init: use /run/modprobe.d instead /etc/modprobe.d we also switch to using 'blacklist' instead of hard blacklisting via install /bin/false since we're now expecting that this file be read after leaving early userspace. --- init.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/init.c b/init.c index c384c16..48d2e14 100644 --- a/init.c +++ b/init.c @@ -470,18 +470,17 @@ static void disable_modules(void) { /* {{{ */ } /* ensure parent dirs exist */ - mkdir("/etc", 0755); - mkdir("/etc/modprobe.d", 0755); + mkdir("/run/modprobe.d", 0755); - fp = fopen("/etc/modprobe.d/initcpio.conf", "w"); + fp = fopen("/run/modprobe.d/initcpio.conf", "w"); if (!fp) { - perror("error: /etc/modprobe.d/initcpio.conf"); + perror("error: /run/modprobe.d/initcpio.conf"); return; } var = strdup(getenv("disablemodules")); for (tok = strtok(var, ","); tok; tok = strtok(NULL, ",")) { - fprintf(fp, "install %s /bin/false\n", tok); + fprintf(fp, "blacklist %s\n", tok); } fclose(fp);