summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-03 17:34:57 +0000
committerGitHub <noreply@github.com>2018-03-03 17:34:57 +0000
commit5d0d140f740fb357bf92a332e658fa39d20ac598 (patch)
treed4df50be21cdc3c3fa8edb56323c6fa3d022631b /nixos
parent6e316ed6a337646842fa8e4a75f0d4b04dec7f56 (diff)
parent552105d5026967d89d5f6165cb00db8187eb59d7 (diff)
downloadnixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar.gz
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar.bz2
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar.lz
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar.xz
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.tar.zst
nixlib-5d0d140f740fb357bf92a332e658fa39d20ac598.zip
Merge pull request #34070 from lukeadams/prl-improve
Improve parallels-tools
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/parallels-guest.nix26
1 files changed, 22 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index fc0409e9ec77..36ca7f356d44 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -3,9 +3,7 @@
 with lib;
 
 let
-
-  prl-tools = config.boot.kernelPackages.prl-tools;
-
+  prl-tools = config.hardware.parallels.package;
 in
 
 {
@@ -22,6 +20,26 @@ in
         '';
       };
 
+      autoMountShares = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Control prlfsmountd service. When this service is running, shares can not be manually
+          mounted through `mount -t prl_fs ...` as this service will remount and trample any set options.
+          Recommended to enable for simple file sharing, but extended share use such as for code should
+          disable this to manually mount shares.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = config.boot.kernelPackages.prl-tools;
+        defaultText = "config.boot.kernelPackages.prl-tools";
+        example = literalExample "config.boot.kernelPackages.prl-tools";
+        description = ''
+          Defines which package to use for prl-tools. Override to change the version.
+        '';
+      };
     };
 
   };
@@ -67,7 +85,7 @@ in
       };
     };
 
-    systemd.services.prlfsmountd = {
+    systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares {
       description = "Parallels Shared Folders Daemon";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = rec {