From 7e70cffc45644405a95ccfe39b1dbd54ab132a28 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 1 Jan 2013 14:49:26 +0100 Subject: [PATCH] systemd mount units: better handling of mandatory options --- modules/system/boot/systemd-unit-options.nix | 2 -- modules/system/boot/systemd.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix index e3f0ec6f1d9..ad9b5da2316 100644 --- a/modules/system/boot/systemd-unit-options.nix +++ b/modules/system/boot/systemd-unit-options.nix @@ -205,14 +205,12 @@ rec { mountOptions = unitOptions // { what = mkOption { - default = ""; example = "/dev/sda1"; type = types.uniq types.string; description = "Absolute path of device node, file or other resource. (Mandatory)"; }; where = mkOption { - default = ""; example = "/mnt"; type = types.uniq types.string; description = '' diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix index f0e94266b17..f4d0655118e 100644 --- a/modules/system/boot/systemd.nix +++ b/modules/system/boot/systemd.nix @@ -292,8 +292,6 @@ let }; mountToUnit = name: def: - assert def.mountConfig.What != ""; - assert def.mountConfig.Where != ""; { inherit (def) wantedBy enable; text = ''