From eb20778ebf648a9e5b5dc8dcef52e3aad25029a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 4 Mar 2020 19:50:29 +0100
Subject: sys-boot/myinitramfs: one more fix to pass path

---
 sys-boot/myinitramfs/files/init.enc              |  3 +-
 sys-boot/myinitramfs/myinitramfs-1.5.4-r1.ebuild | 45 ------------------------
 sys-boot/myinitramfs/myinitramfs-1.5.5-r1.ebuild | 45 ++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 46 deletions(-)
 delete mode 100644 sys-boot/myinitramfs/myinitramfs-1.5.4-r1.ebuild
 create mode 100644 sys-boot/myinitramfs/myinitramfs-1.5.5-r1.ebuild

diff --git a/sys-boot/myinitramfs/files/init.enc b/sys-boot/myinitramfs/files/init.enc
index d6ee5a7..cdb4ab0 100755
--- a/sys-boot/myinitramfs/files/init.enc
+++ b/sys-boot/myinitramfs/files/init.enc
@@ -84,7 +84,8 @@ root="$(blkid | awk -v uuid="UUID=\"$uuid\"" '$2 == uuid { gsub(/:$/,"",$1); pri
 
 echo -e "${C_GREEN}Unlocking root...${C_NO}"
 if command -v initramfs_password >/dev/null; then
-	busybox ash initramfs_password | cryptsetup open --key-file=- "$root" encroot
+	busybox ash "$(command -v initramfs_password)" | \
+		cryptsetup open --key-file=- "$root" encroot
 else
 	cryptsetup open "$root" encroot
 fi || fail "Unlocking root failed! /proc/cmdline=$(cat /proc/cmdline)"
diff --git a/sys-boot/myinitramfs/myinitramfs-1.5.4-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.5.4-r1.ebuild
deleted file mode 100644
index 2cb3f91..0000000
--- a/sys-boot/myinitramfs/myinitramfs-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO support encrytion and btrfs only as option
-
-EAPI=6
-
-VER="${PV%-r*}"
-
-DESCRIPTION="My personal initramfs (verry simple with encryption support)"
-S="${WORKDIR}/myinitramfs-${VER}"
-
-LICENSE="GPLv2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dmi"
-
-DEPEND="sys-fs/cryptsetup
-sys-fs/btrfs-progs
-sys-apps/linux-misc-apps
-sys-apps/busybox[static]
-dmi? (
-	sys-apps/dmidecode
-	sys-apps/coreutils
-)"
-RDEPEND="${DEPEND}
-sys-kernel/linux[initramfs]"
-
-src_unpack() {
-	# Well we have no sources so just create empty directory
-	mkdir -p "${S}"
-}
-
-src_compile() {
-	use dmi && export USE_DMI=1
-	"${FILESDIR}/gen.sh" initramfs-gentoo
-}
-
-src_install() {
-	dodir /boot
-	insinto /boot
-	newins initramfs-gentoo initramfs-gentoo
-
-	dosbin "${FILESDIR}/initramfs_password"
-}
diff --git a/sys-boot/myinitramfs/myinitramfs-1.5.5-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.5.5-r1.ebuild
new file mode 100644
index 0000000..2cb3f91
--- /dev/null
+++ b/sys-boot/myinitramfs/myinitramfs-1.5.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO support encrytion and btrfs only as option
+
+EAPI=6
+
+VER="${PV%-r*}"
+
+DESCRIPTION="My personal initramfs (verry simple with encryption support)"
+S="${WORKDIR}/myinitramfs-${VER}"
+
+LICENSE="GPLv2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dmi"
+
+DEPEND="sys-fs/cryptsetup
+sys-fs/btrfs-progs
+sys-apps/linux-misc-apps
+sys-apps/busybox[static]
+dmi? (
+	sys-apps/dmidecode
+	sys-apps/coreutils
+)"
+RDEPEND="${DEPEND}
+sys-kernel/linux[initramfs]"
+
+src_unpack() {
+	# Well we have no sources so just create empty directory
+	mkdir -p "${S}"
+}
+
+src_compile() {
+	use dmi && export USE_DMI=1
+	"${FILESDIR}/gen.sh" initramfs-gentoo
+}
+
+src_install() {
+	dodir /boot
+	insinto /boot
+	newins initramfs-gentoo initramfs-gentoo
+
+	dosbin "${FILESDIR}/initramfs_password"
+}
-- 
cgit v1.2.3