diff --git a/.version b/.version index dc1e644..9c6d629 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.6.0 +1.6.1 diff --git a/93metalluksetcd/metal-luksetcd-disk.sh b/93metalluksetcd/metal-luksetcd-disk.sh index 8ae9c34..0c1fc03 100755 --- a/93metalluksetcd/metal-luksetcd-disk.sh +++ b/93metalluksetcd/metal-luksetcd-disk.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # DEVICES EXIST or DIE [ -f /tmp/metaletcddisk.done ] && exit 0 diff --git a/93metalluksetcd/metal-luksetcd-genrules.sh b/93metalluksetcd/metal-luksetcd-genrules.sh index f43564c..5f272ee 100755 --- a/93metalluksetcd/metal-luksetcd-genrules.sh +++ b/93metalluksetcd/metal-luksetcd-genrules.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash command -v getarg >/dev/null || . /lib/dracut-lib.sh @@ -7,4 +7,4 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh # Only run when we're being provisioned by a metal.server if getargbool 0 rd.luks -d -n rd_NO_LUKS; then /sbin/initqueue --settled --onetime --unique /sbin/metal-luksetcd-disk -fi \ No newline at end of file +fi diff --git a/93metalluksetcd/metal-luksetcd-unlock.sh b/93metalluksetcd/metal-luksetcd-unlock.sh index 1ae8aeb..225df32 100644 --- a/93metalluksetcd/metal-luksetcd-unlock.sh +++ b/93metalluksetcd/metal-luksetcd-unlock.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # metal-luksetcd-unlock.sh type unlock > /dev/null 2>&1 || . /lib/metal-luksetcd-lib.sh diff --git a/93metalluksetcd/metal-update-keystore.sh b/93metalluksetcd/metal-update-keystore.sh index 3effd03..c4579e6 100644 --- a/93metalluksetcd/metal-update-keystore.sh +++ b/93metalluksetcd/metal-update-keystore.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -u # metal-update-keystore # This file copies our master-key to the overlayFS. diff --git a/93metalluksetcd/module-setup.sh b/93metalluksetcd/module-setup.sh index 42d5dd4..6145db5 100755 --- a/93metalluksetcd/module-setup.sh +++ b/93metalluksetcd/module-setup.sh @@ -2,7 +2,8 @@ # called by dracut check() { - return 0 + require_binaries basename cryptsetup lvm mkfs.xfs parted || return 1 + return } # called by dracut @@ -17,7 +18,7 @@ installkernel() { # called by dracut install() { - inst_multiple parted mkfs.xfs lsblk sort tail lvm vgcreate lvcreate cryptsetup pvs chmod basename + inst_multiple basename chmod cryptsetup lsblk lvcreate lvm mkfs.xfs parted pvs sort tail vgcreate inst_simple "$moddir/metal-luksetcd-lib.sh" "/lib/metal-luksetcd-lib.sh" inst_script "$moddir/metal-luksetcd-disk.sh" /sbin/metal-luksetcd-disk diff --git a/93metalluksetcd/parse-metal-luksetcd.sh b/93metalluksetcd/parse-metal-luksetcd.sh index b822dad..3d36797 100755 --- a/93metalluksetcd/parse-metal-luksetcd.sh +++ b/93metalluksetcd/parse-metal-luksetcd.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2020 Hewlett Packard Enterprise Development LP #