Merge pull request #76 from aschnell/master

- allow to not add encryption in /etc/crypttab
openSUSE · Sep 22, 2023 · d2a1e23 · d2a1e23
2 parents 0f21b0f + bf9d489
commit d2a1e23
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/barrel/create-encryption.cc b/barrel/create-encryption.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2021-2022] SUSE LLC
+ * Copyright (c) [2021-2023] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -49,6 +49,7 @@ namespace barrel
 	    { "label", required_argument, 0, _("set label of device"), "label" },
 	    { "pool-name", required_argument, 0, _("pool name"), "name" },
 	    { "size", required_argument, 's', _("set size"), "size" },
+	    { "no-crypttab", no_argument, 0, _("do not add in /etc/crypttab") },
 	    { "force", no_argument, 0, _("force if block devices are in use") }
 	}, TakeBlkDevices::MAYBE);
 
@@ -68,6 +69,7 @@ namespace barrel
 	    optional<string> label;
 	    optional<string> pool_name;
 	    optional<SmartSize> size;
+	    bool crypttab = true;
 	    bool force = false;
 
 	    vector<string> blk_devices;
@@ -111,6 +113,8 @@ namespace barrel
 		size = SmartSize(str);
 	    }
 
+	    crypttab = !parsed_opts.has_option("no-crypttab");
+
 	    force = parsed_opts.has_option("force");
 
 	    blk_devices = parsed_opts.get_blk_devices();
@@ -256,6 +260,8 @@ namespace barrel
 	Encryption* encryption = blk_device->create_encryption(dm_name, type);
 	encryption->set_password(password);
 
+	encryption->set_in_etc_crypttab(options.crypttab);
+
 	if (options.label && is_luks(encryption))
 	    to_luks(encryption)->set_label(options.label.value());
 

diff --git a/doc/barrel.xml.in b/doc/barrel.xml.in
@@ -2,13 +2,13 @@
 <refentry id='barrel8' xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <refentryinfo>
-    <date>2023-09-21</date>
+    <date>2023-09-22</date>
   </refentryinfo>
 
   <refmeta>
     <refentrytitle>barrel</refentrytitle>
     <manvolnum>8</manvolnum>
-    <refmiscinfo class='date'>2023-09-21</refmiscinfo>
+    <refmiscinfo class='date'>2023-09-22</refmiscinfo>
     <refmiscinfo class='version'>@VERSION@</refmiscinfo>
     <refmiscinfo class='manual'>Storage Management</refmiscinfo>
   </refmeta>
@@ -264,6 +264,12 @@
 		<para>Approximate size of resulting encryption device.</para>
 	      </listitem>
 	    </varlistentry>
+	    <varlistentry>
+	      <term><option>--no-crypttab</option></term>
+	      <listitem>
+		<para>Do not add the encryption in /etc/crypttab.</para>
+	      </listitem>
+	    </varlistentry>
 	    <varlistentry>
 	      <term><option>--force</option></term>
 	      <listitem>
@@ -605,7 +611,7 @@
 	    <varlistentry>
 	      <term><option>-l, --level</option> <replaceable>level</replaceable></term>
 	      <listitem>
-		<para>Set RAID level. Possible values are 0, stripe, 1,
+		<para>Set RAID level. Possible values are linear, 0, stripe, 1,
 		mirror, 4, 5, 6 and 10.</para>
 	      </listitem>
 	    </varlistentry>