- added checks

openSUSE · Jul 11, 2024 · a2f474d · a2f474d
1 parent 63e0809
commit a2f474d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/barrel/create-encryption.cc b/barrel/create-encryption.cc
@@ -205,6 +205,10 @@ namespace barrel
 	void
 	Options::check() const
 	{
+	    if (activate_by && activate_by.value() == MountByType::LABEL && !label)
+	    {
+		throw runtime_error(_("activate-by label requires a label"));
+	    }
 	}
 
     }

diff --git a/barrel/create-filesystem.cc b/barrel/create-filesystem.cc
@@ -321,6 +321,11 @@ namespace barrel
 		    throw runtime_error(_("mount options require a path"));
 	    }
 
+	    if (mount_by && mount_by.value() == MountByType::LABEL && !label)
+	    {
+		throw runtime_error(_("mount-by label requires a label"));
+	    }
+
 	    if (number && !supports_multiple_devices(type.value()))
 	    {
 		throw runtime_error(sformat(_("option --devices not allowed for %s"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,6 +205,10 @@ namespace barrel @@
     	void
     	Options::check() const
     	{
+    	    if (activate_by && activate_by.value() == MountByType::LABEL && !label)
+    	    {
+    		throw runtime_error(_("activate-by label requires a label"));
+    	    }
     	}
         }
@@ Expand Down @@