summary refs log tree commit diff
path: root/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-11-26 14:34:29 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-11-26 14:34:29 +0000
commit7ff9a499297b7a35f97dce831eb51fbcc9461b44 (patch)
tree0ce82268b513452daeefeeddeeedc9a5da2f9b63 /pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
parentcbb3b6f1dc6871b88e9a12c9ea8b5f922c58e60b (diff)
downloadnixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar.gz
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar.bz2
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar.lz
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar.xz
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.tar.zst
nixpkgs-7ff9a499297b7a35f97dce831eb51fbcc9461b44.zip
Making halt and shutdown work fine in sysvinit (they had hardcoded /sbin, and
now I hardcode $out/sbin)
I also remove a patch I don't know what was it for.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24874
Diffstat (limited to 'pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch')
-rw-r--r--pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch b/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
deleted file mode 100644
index ef3d0f66b2f..00000000000
--- a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN sysvinit-2.85/src/halt.c sysvinit-2.85.new/src/halt.c
---- sysvinit-2.85/src/halt.c	2001-11-27 13:12:03.000000000 +0100
-+++ sysvinit-2.85.new/src/halt.c	2005-10-18 20:09:47.000000000 +0200
-@@ -53,6 +53,10 @@
- #define KERNEL_MONITOR	1 /* If halt() puts you into the kernel monitor. */
- #define RUNLVL_PICKY	0 /* Be picky about the runlevel */
- 
-+#ifndef EXEC_PATH
-+  #define EXEC_PATH "/sbin/shutdown"
-+#endif
-+
- extern int ifdown(void);
- extern int hddown(void);
- extern void write_wtmp(char *user, char *id, int pid, int type, char *line);
-@@ -139,7 +143,7 @@
- 	args[i++] = "now";
- 	args[i++] = NULL;
- 
--	execv("/sbin/shutdown", args);
-+	execv(EXEC_PATH, args);
- 	execv("/etc/shutdown", args);
- 	execv("/bin/shutdown", args);