From: Nathan Hintz <nlhintz@hotmail.com>
Date: Mon, 20 Feb 2017 20:39:11 +0000 (+0000)
Subject: procd: update modprobe path
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35209a01f2df708546d5aecca05cdcf11c0e7332;p=oweals%2Fprocd.git

procd: update modprobe path

Commit 81aeba9b7f619ee1af1a64f355ae8001fa147d03 in LEDE source.git moved
modprobe to the "/sbin" directory.  Update procd with the new path.

Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
---

diff --git a/initd/zram.c b/initd/zram.c
index 9fab794..0e78195 100644
--- a/initd/zram.c
+++ b/initd/zram.c
@@ -53,9 +53,9 @@ static int
 early_insmod(char *module)
 {
 	pid_t pid = fork();
+	char *modprobe[] = { "/sbin/modprobe", NULL, NULL };
 
 	if (!pid) {
-		char *modprobe[] = { "/usr/sbin/modprobe", NULL, NULL };
 		char *path;
 		struct utsname ver;
 
@@ -64,12 +64,12 @@ early_insmod(char *module)
 		sprintf(path, module, ver.release);
 		modprobe[1] = path;
 		execvp(modprobe[0], modprobe);
-		ERROR("Can't exec /usr/sbin/modprobe\n");
+		ERROR("Can't exec %s\n", modprobe[0]);
 		exit(-1);
 	}
 
 	if (pid <= 0) {
-		ERROR("Can't exec /usr/sbin/modprobe\n");
+		ERROR("Can't exec %s\n", modprobe[0]);
 		return -1;
 	} else {
 		waitpid(pid, NULL, 0);
@@ -107,10 +107,10 @@ mount_zram_on_tmp(void)
 	pid = fork();
 	if (!pid) {
 		execvp(mkfs[0], mkfs);
-		ERROR("Can't exec /sbin/mkfs.ext4\n");
+		ERROR("Can't exec %s\n", mkfs[0]);
 		exit(-1);
 	} else if (pid <= 0) {
-		ERROR("Can't exec /sbin/mkfs.ext4\n");
+		ERROR("Can't exec %s\n", mkfs[0]);
 		return -1;
 	} else {
 		waitpid(pid, NULL, 0);