nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Will Fancher 2024-09-06 23:48:36 -04:00 committed by GitHub
commit 6ca18cee34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/tests/zfs.nix
View File

@ -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";

9
pkgs/os-specific/linux/zfs/generic.nix
View File

@ -182,10 +182,11 @@ let
# Remove tests because they add a runtime dependency on gcc
rm -rf $out/share/zfs/zfs-tests
# 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)
${optionalString (lib.versionOlder version "2.2") ''
# Add Bash completions.
install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs
(cd $out/share/bash-completion/completions; ln -s zfs zpool)
''}
'';
postFixup = let