summary refs log tree commit diff
path: root/nixos/modules/system/activation
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-09-17 13:53:12 +0300
committerNikolay Amiantov <ab@fmap.me>2017-02-17 21:54:58 +0300
commit213356c9278330f32749a06cd8bc5e8727ff6849 (patch)
tree01cc5cf7f47316d1354bac191dd52e9061c9fede /nixos/modules/system/activation
parent08881b8cbe03a058310eb62aa316dbd095682e59 (diff)
downloadnixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar.gz
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar.bz2
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar.lz
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar.xz
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.tar.zst
nixlib-213356c9278330f32749a06cd8bc5e8727ff6849.zip
activation-script service: add utillinux to path
Diffstat (limited to 'nixos/modules/system/activation')
-rw-r--r--nixos/modules/system/activation/activation-script.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index dcf105eb7844..c2ac731d433d 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -19,6 +19,7 @@ let
       glibc # needed for getent
       shadow
       nettools # needed for hostname
+      utillinux # needed for mount and mountpoint
     ];
 
 in
@@ -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}
       '';