Skip to content

Commit

Permalink
activation-script service: add utillinux to path
Browse files Browse the repository at this point in the history
  • Loading branch information
abbradar committed Feb 17, 2017
1 parent 08881b8 commit 213356c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions nixos/modules/system/activation/activation-script.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ let
glibc # needed for getent
shadow
nettools # needed for hostname
utillinux # needed for mount and mountpoint
];

in
Expand Down Expand Up @@ -168,12 +169,12 @@ in
local options="$3"
local fsType="$4"
if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then
if mountpoint -q "$mountPoint"; then
local options="remount,$options"
else
mkdir -m 0755 -p "$mountPoint"
fi
${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"
mount -t "$fsType" -o "$options" "$device" "$mountPoint"
}
source ${config.system.build.earlyMountScript}
'';
Expand Down

0 comments on commit 213356c

Please sign in to comment.