31 lines
1 KiB
Diff
31 lines
1 KiB
Diff
Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
|
|
which isn't valid on NixOS (and a compatibility link on most other modern
|
|
distros anyway).
|
|
|
|
-- nckx <tobias.geerinckx.rice@gmail.com>
|
|
diff --git a/include/pathnames.h b/include/pathnames.h
|
|
index de6a13c..0c1aeb9 100644
|
|
--- a/include/pathnames.h
|
|
+++ b/include/pathnames.h
|
|
@@ -50,7 +50,7 @@
|
|
#define _PATH_VAR_NOLOGIN "/var/run/nologin"
|
|
|
|
#define _PATH_LOGIN "/bin/login"
|
|
-#define _PATH_SHUTDOWN "/sbin/shutdown"
|
|
+#define _PATH_SHUTDOWN "shutdown"
|
|
|
|
#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
|
|
#define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
|
|
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
|
|
index 7c748dc..9a99a7c 100644
|
|
--- a/sys-utils/rtcwake.c
|
|
+++ b/sys-utils/rtcwake.c
|
|
@@ -575,7 +575,7 @@ int main(int argc, char **argv)
|
|
arg[i++] = "now";
|
|
arg[i] = NULL;
|
|
if (!ctl.dryrun) {
|
|
- execv(arg[0], arg);
|
|
+ execvp(arg[0], arg);
|
|
warn(_("failed to execute %s"), _PATH_SHUTDOWN);
|
|
rc = EXIT_FAILURE;
|
|
}
|