diff --git a/dracut/29kcrypt/generator.sh b/dracut/29kcrypt/generator.sh index c3443ff..f0451a8 100755 --- a/dracut/29kcrypt/generator.sh +++ b/dracut/29kcrypt/generator.sh @@ -29,7 +29,7 @@ neednet="rd.neednet" echo "[Service]" echo "Type=oneshot" echo "RemainAfterExit=no" - echo "ExecStart=/sbin/kcrypt-mount-local" + echo "ExecStart=/usr/bin/kcrypt unlock-all" } > "$GENERATOR_DIR"/kcrypt.service diff --git a/dracut/29kcrypt/module-setup.sh b/dracut/29kcrypt/module-setup.sh index 7ff7024..1b41f96 100644 --- a/dracut/29kcrypt/module-setup.sh +++ b/dracut/29kcrypt/module-setup.sh @@ -27,8 +27,7 @@ install() { inst_multiple \ kcrypt - inst_script "${moddir}/mount-local.sh" "/sbin/kcrypt-mount-local" - #inst_hook pre-trigger 10 "$moddir/mount-local.sh" + inst_script "${moddir}/generator.sh" \ "${systemdutildir}/system-generators/dracut-kcrypt-generator" diff --git a/dracut/29kcrypt/mount-local.sh b/dracut/29kcrypt/mount-local.sh deleted file mode 100755 index 85bece1..0000000 --- a/dracut/29kcrypt/mount-local.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -# ex: ts=8 sw=4 sts=4 et filetype=sh - -type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh - -PATH=/usr/sbin:/usr/bin:/sbin:/bin - -OEM=$(blkid -L COS_OEM) - -if [ "$OEM" != "" ]; then - mkdir /oem - mount $OEM /oem -fi - -kcrypt unlock-all \ No newline at end of file