diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-30 10:49:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-30 12:39:35 +0200 |
| commit | b7c543136a427ec130c7dbb87fb90dc2107ccb46 (patch) | |
| tree | 146af4cfb8fd12c4d5a2de1e44fd3e545aa56e66 /nixos/modules/system | |
| parent | cf744cb715ead592ff0b7ac2771a2d551d76b7f9 (diff) | |
| download | nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.gz nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.bz2 nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.lz nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.xz nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.zst nixlib-b7c543136a427ec130c7dbb87fb90dc2107ccb46.zip | |
Move CIFS support into a separate module
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 01558b8f9b28..327f11bc6987 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -23,22 +23,6 @@ let }; - needsCifsUtils = kernelPackages.kernel ? features - && kernelPackages.kernel.features ? needsCifsUtils - && kernelPackages.kernel.features.needsCifsUtils - && any (fs: fs.fsType == "cifs") fileSystems; - - busybox = - if needsCifsUtils - then pkgs.busybox.override { - extraConfig = '' - CONFIG_FEATURE_MOUNT_CIFS n - CONFIG_FEATURE_MOUNT_HELPERS y - ''; - } - else pkgs.busybox; - - # Some additional utilities needed in stage 1, like mount, lvm, fsck # etc. We don't want to bring in all of those packages, so we just # copy what we need. Instead of using statically linked binaries, @@ -62,7 +46,7 @@ let cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib # Copy BusyBox. - cp -rvd ${busybox}/{bin,sbin} $out/ + cp -rvd ${pkgs.busybox}/{bin,sbin} $out/ chmod -R u+w $out # Copy some utillinux stuff. @@ -91,11 +75,6 @@ let cp -v ${pkgs.kmod}/bin/kmod $out/bin/ ln -s kmod $out/bin/modprobe - # Maybe copy cifs utils - ${optionalString needsCifsUtils '' - cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin - ''} - ${config.boot.initrd.extraUtilsCommands} # Strip binaries further than normal. |