Unverified Commit 6ca18cee authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

zfs: Fix samba freeform settings and 2.1 build (#340165)

parents c254ef63 cf572e0f

nixos/tests/zfs.nix

+9 −9
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ let 
        specialisation.samba.configuration = {

          services.samba = {

            enable = true;

            extraConfig = ''

              registry shares = yes

              usershare path = ${usersharePath}

              usershare allow guests = yes

              usershare max shares = 100

              usershare owner only = no

            '';

            settings.global = {

              "registry shares" = true;

              "usershare path" = "${usersharePath}";

              "usershare allow guests" = true;

              "usershare max shares" = "100";

              "usershare owner only" = false;

            };

          };

          systemd.services.samba-smbd.serviceConfig.ExecStartPre =

            "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}";
@@ -213,8 +213,8 @@ in { 
    enableSystemdStage1 = true;

  };



  installerBoot = (import ./installer.nix { }).separateBootZfs;

  installer = (import ./installer.nix { }).zfsroot;

  installerBoot = (import ./installer.nix { inherit system; }).separateBootZfs;

  installer = (import ./installer.nix { inherit system; }).zfsroot;



  expand-partitions = makeTest {

    name = "multi-disk-zfs";

pkgs/os-specific/linux/zfs/generic.nix

+5 −4
Original line number Diff line number Diff line
@@ -182,10 +182,11 @@ let 
      # Remove tests because they add a runtime dependency on gcc

      rm -rf $out/share/zfs/zfs-tests



      ${optionalString (lib.versionOlder version "2.2") ''

        # Add Bash completions.

        install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs

    '' + optionalString (lib.versionOlder version "2.2.6") ''

        (cd $out/share/bash-completion/completions; ln -s zfs zpool)

      ''}

    '';



    postFixup = let