diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-04-27 23:19:02 -0400 |
|---|---|---|
| committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-04-27 23:26:46 -0400 |
| commit | 279a01d0dcbe4629687c95d897069ac6351d3c86 (patch) | |
| tree | 9648a64e9421cb01b2541b7627f5491e91b86c55 /pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch | |
| parent | b465dc202f0ba6e5ce465c5dabca2b2a3560cad6 (diff) | |
| download | nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar.gz nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar.bz2 nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar.lz nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar.xz nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.tar.zst nixpkgs-279a01d0dcbe4629687c95d897069ac6351d3c86.zip | |
util-linux: 2.27.1 -> 2.28
Diffstat (limited to 'pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch index 68970c655f1..3615984ed0c 100644 --- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch +++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch @@ -3,23 +3,24 @@ which isn't valid on NixOS (and a compatibility link on most other modern distros anyway). -- nckx <tobias.geerinckx.rice@gmail.com> - -diff -ru util-linux-2.27-orig/include/pathnames.h util-linux-2.27/include/pathnames.h ---- util-linux-2.27-orig/include/pathnames.h 2015-06-29 13:13:14.669847478 +0200 -+++ util-linux-2.27/include/pathnames.h 2015-10-07 20:09:17.401022602 +0200 -@@ -54,7 +54,7 @@ - #define _PATH_INITTAB "/etc/inittab" - #define _PATH_RC "/etc/rc" - #define _PATH_REBOOT "/sbin/reboot" +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_SINGLE "/etc/singleboot" - #define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf" -diff -ru util-linux-2.27-orig/sys-utils/rtcwake.c util-linux-2.27/sys-utils/rtcwake.c ---- util-linux-2.27-orig/sys-utils/rtcwake.c 2015-08-05 11:32:44.453821232 +0200 -+++ util-linux-2.27/sys-utils/rtcwake.c 2015-10-07 20:09:37.834032536 +0200 -@@ -576,7 +576,7 @@ + #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) { |