MTL-1407 Honor rd.luks=0 Throughout (#24)

.version

@@ -1 +1 @@
-1.6.1
+1.6.2

93metalluksetcd/metal-luksetcd-unlock.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 # metal-luksetcd-unlock.sh
+if [ $metal_noluks = 0 ]; then 
+    echo >2 'skipping unlocking of LUKS devices (rd.luks=0 was set on the cmdline)'
+    exit 0
+fi
 
 type unlock > /dev/null 2>&1 || . /lib/metal-luksetcd-lib.sh
 

93metalluksetcd/metal-update-keystore.sh

@@ -10,8 +10,8 @@ set -u
 #   2. rd.luks.key=/pki/etcd.key:LABEL=ROOTRAID must be given so the OS knows to look for the key here.
 #
 # The values above can be anything, as long as their given and refer to the same device.
-if getargbool 0 rd.luks -d -n rd_NO_LUKS; then
-    echo >2 'skipping keystore management (no LUKS)'
+if [ $metal_noluks = 0 ]; then 
+    echo >2 'skipping keystore management (no LUKS; rd.luks=0 was set on the cmdline)'
     exit 0
 fi
 

93metalluksetcd/parse-metal-luksetcd.sh

@@ -12,7 +12,9 @@ getargbool 0 metal.debug -d -y metal_debug && metal_debug=1
 metal_size_etcdk8s=$(getargnum 32 10 64 metal.disk.etcdk8s.size)
 
 getargbool 0 metal.no-wipe -d -y metal_nowipe && metal_nowipe=1 || metal_nowipe=0
+getargbool 0 rd.luks -d -n rd_NO_LUKS && metal_noluks=1 || metal_noluks=0
 
+export metal_noluks 
 export metal_debug
 export metal_size_etcdk8s
 export metal_nowipe