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

activation-script service: add utillinux to path

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-09-17 13:53:12 +03:00
parent 08881b8cbe
commit 213356c927
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/activation/activation-script.nix
View File

@ -19,6 +19,7 @@ let
glibc # needed for getent glibc # needed for getent
shadow shadow
nettools # needed for hostname nettools # needed for hostname
utillinux # needed for mount and mountpoint
]; ];
in in
@ -168,12 +169,12 @@ in
local options="$3" local options="$3"
local fsType="$4" local fsType="$4"
if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then if mountpoint -q "$mountPoint"; then
local options="remount,$options" local options="remount,$options"
else else
mkdir -m 0755 -p "$mountPoint" mkdir -m 0755 -p "$mountPoint"
fi fi
${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint" mount -t "$fsType" -o "$options" "$device" "$mountPoint"
} }
source ${config.system.build.earlyMountScript} source ${config.system.build.earlyMountScript}
''; '';