public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix references to current-system/sw/sbin

Browse Source
This commit is contained in:
William A. Kennington III
2015-04-01 13:57:36 -07:00
parent a9f2e107d0
commit ff21171921
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/config/users-groups.nix
+1 -1
View File
@@ -110,7 +110,7 @@ let
shell = mkOption { shell = mkOption {
type = types.str; type = types.str;
default = "/run/current-system/sw/sbin/nologin"; default = "/run/current-system/sw/bin/nologin";
description = "The path to the user's shell."; description = "The path to the user's shell.";
}; };
nixos/modules/services/monitoring/munin.nix
+2 -2
View File
@@ -34,7 +34,7 @@ let
cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file)
wrapProgram $file \ wrapProgram $file \
--set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \ --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \
--set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
--set MUNIN_PLUGSTATE "/var/run/munin" --set MUNIN_PLUGSTATE "/var/run/munin"
@@ -194,7 +194,7 @@ in
mkdir -p /etc/munin/plugins mkdir -p /etc/munin/plugins
rm -rf /etc/munin/plugins/* rm -rf /etc/munin/plugins/*
PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
''; '';
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";
nixos/modules/services/network-filesystems/drbd.nix
+1 -1
View File
@@ -44,7 +44,7 @@ let cfg = config.services.drbd; in
boot.extraModprobeConfig = boot.extraModprobeConfig =
'' ''
options drbd usermode_helper=/run/current-system/sw/sbin/drbdadm options drbd usermode_helper=/run/current-system/sw/bin/drbdadm
''; '';
environment.etc = singleton environment.etc = singleton
nixos/modules/services/x11/display-managers/lightdm.nix
+1 -1
View File
@@ -55,7 +55,7 @@ let
[UserList] [UserList]
minimum-uid=500 minimum-uid=500
hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-users=${concatStringsSep " " dmcfg.hiddenUsers}
hidden-shells=/run/current-system/sw/sbin/nologin hidden-shells=/run/current-system/sw/bin/nologin
''; '';
lightdmConf = writeText "lightdm.conf" lightdmConf = writeText "lightdm.conf"
nixos/modules/services/x11/display-managers/sddm.nix
+1 -1
View File
@@ -26,7 +26,7 @@ let
[Users] [Users]
MaximumUid=${toString config.ids.uids.nixbld} MaximumUid=${toString config.ids.uids.nixbld}
HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} HideUsers=${concatStringsSep "," dmcfg.hiddenUsers}
HideShells=/run/current-system/sw/sbin/nologin HideShells=/run/current-system/sw/bin/nologin
[XDisplay] [XDisplay]
MinimumVT=${toString xcfg.tty} MinimumVT=${toString xcfg.tty}
pkgs/os-specific/linux/autofs/autofs-v5.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
configureFlags="--disable-move-mount --with-path=$PATH" configureFlags="--disable-move-mount --with-path=$PATH"
export MOUNT=/var/run/current-system/sw/bin/mount export MOUNT=/var/run/current-system/sw/bin/mount
export UMOUNT=/var/run/current-system/sw/bin/umount export UMOUNT=/var/run/current-system/sw/bin/umount
export MODPROBE=/var/run/current-system/sw/sbin/modprobe export MODPROBE=/var/run/current-system/sw/bin/modprobe
# Grrr, rpcgen can't find cpp. (NIXPKGS-48) # Grrr, rpcgen can't find cpp. (NIXPKGS-48)
mkdir rpcgen mkdir rpcgen
echo "#! $shell" > rpcgen/rpcgen echo "#! $shell" > rpcgen/rpcgen
pkgs/os-specific/linux/systemd/fixes.patch
+1 -1
View File
@@ -229,7 +229,7 @@ index 70a5918..1926e52 100644
- cmdline[i++] = "/sbin/fsck"; - cmdline[i++] = "/sbin/fsck";
- cmdline[i++] = arg_repair; - cmdline[i++] = arg_repair;
+ cmdline[i++] = "/run/current-system/sw/sbin/fsck"; + cmdline[i++] = "/run/current-system/sw/bin/fsck";
cmdline[i++] = "-T"; cmdline[i++] = "-T";
/* /*
pkgs/os-specific/linux/udisks/1-default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/main.c --replace \ substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \ "/sbin:/bin:/usr/sbin:/usr/bin" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin"
''; '';
buildInputs = buildInputs =
pkgs/os-specific/linux/udisks/2-default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'' ''
substituteInPlace src/main.c --replace \ substituteInPlace src/main.c --replace \
"@path@" \ "@path@" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin"
''; '';
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
pkgs/os-specific/linux/util-linux/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
--enable-mesg --enable-mesg
--enable-ddate --enable-ddate
--disable-use-tty-group --disable-use-tty-group
--enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin
${if ncurses == null then "--without-ncurses" else ""} ${if ncurses == null then "--without-ncurses" else ""}
''; '';
pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch
+1 -1
View File
@@ -16,7 +16,7 @@ diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount
# Ignore the prefix for the mount helper. It must be installed in /sbin/ # Ignore the prefix for the mount helper. It must be installed in /sbin/
# because this path is hardcoded in the mount(8) for security reasons. # because this path is hardcoded in the mount(8) for security reasons.
+ # + #
+ # ... except on nixos, where it really is /var/run/current-system/sw/sbin, + # ... except on nixos, where it really is /var/run/current-system/sw/bin,
+ # which is where this will end up if we put it in ${out}/sbin. + # which is where this will end up if we put it in ${out}/sbin.
# #
sbin_PROGRAMS = mount.zfs sbin_PROGRAMS = mount.zfs
pkgs/servers/mail/postfix/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
-e s,/usr/sbin,/var/run/current-system/sw/sbin, \ -e s,/usr/sbin,/var/run/current-system/sw/bin, \
-e s,:/sbin,, src/util/sys_defs.h -e s,:/sbin,, src/util/sys_defs.h
''; '';
pkgs/tools/networking/network-manager/nixos-purity.patch
+2 -2
View File
@@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644
for (iter = modules; *iter; iter++) { for (iter = modules; *iter; iter++) {
- char *argv[3] = { "/sbin/modprobe", *iter, NULL }; - char *argv[3] = { "/sbin/modprobe", *iter, NULL };
+ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL }; + char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL };
char *envp[1] = { NULL }; char *envp[1] = { NULL };
GError *error = NULL; GError *error = NULL;
@@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644
/* Make sure /dev/ppp exists (bgo #533064) */ /* Make sure /dev/ppp exists (bgo #533064) */
if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
- ignored = system ("/sbin/modprobe ppp_generic"); - ignored = system ("/sbin/modprobe ppp_generic");
+ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic"); + ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic");
connection = nm_act_request_get_connection (req); connection = nm_act_request_get_connection (req);
g_assert (connection); g_assert (connection);