From 1b4455a5669e5961ad6164053f0280bb0c0b16c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 5 Apr 2018 08:19:38 +0200
Subject: myinitramfs: try to fix rootuuid option

---
 sys-boot/myinitramfs/files/init.enc              |  2 +-
 sys-boot/myinitramfs/myinitramfs-1.4-r1.ebuild   | 38 ------------------------
 sys-boot/myinitramfs/myinitramfs-1.4.1-r1.ebuild | 38 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 sys-boot/myinitramfs/myinitramfs-1.4-r1.ebuild
 create mode 100644 sys-boot/myinitramfs/myinitramfs-1.4.1-r1.ebuild

(limited to 'sys-boot')

diff --git a/sys-boot/myinitramfs/files/init.enc b/sys-boot/myinitramfs/files/init.enc
index ef92527..03cfffc 100755
--- a/sys-boot/myinitramfs/files/init.enc
+++ b/sys-boot/myinitramfs/files/init.enc
@@ -52,7 +52,7 @@ for opt in $(cat /proc/cmdline); do
 			root=${opt:5}
 			;;
 		rootuuid=*)
-			root=/dev/disk/by-uuid/${opt:9}
+			root="$(blkid --uuid ${opt:9} --output device)"
 			;;
 		rootflags=*)
 			rootflags=${opt:10}
diff --git a/sys-boot/myinitramfs/myinitramfs-1.4-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.4-r1.ebuild
deleted file mode 100644
index dac9c19..0000000
--- a/sys-boot/myinitramfs/myinitramfs-1.4-r1.ebuild
+++ /dev/null
@@ -1,38 +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=""
-
-DEPEND="sys-fs/cryptsetup:=
-sys-fs/btrfs-progs:=
-sys-apps/linux-misc-apps
-sys-apps/busybox[static]:="
-RDEPEND="${DEPEND}
-sys-kernel/linux[initramfs]"
-
-src_unpack() {
-	# Well we have no sources so just create empty directory
-	mkdir -p "${S}"
-}
-
-src_compile() {
-	"${FILESDIR}/gen.sh" initramfs-gentoo
-}
-
-src_install() {
-	dodir /boot
-	insinto /boot
-	newins initramfs-gentoo initramfs-gentoo
-}
diff --git a/sys-boot/myinitramfs/myinitramfs-1.4.1-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.4.1-r1.ebuild
new file mode 100644
index 0000000..dac9c19
--- /dev/null
+++ b/sys-boot/myinitramfs/myinitramfs-1.4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# 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=""
+
+DEPEND="sys-fs/cryptsetup:=
+sys-fs/btrfs-progs:=
+sys-apps/linux-misc-apps
+sys-apps/busybox[static]:="
+RDEPEND="${DEPEND}
+sys-kernel/linux[initramfs]"
+
+src_unpack() {
+	# Well we have no sources so just create empty directory
+	mkdir -p "${S}"
+}
+
+src_compile() {
+	"${FILESDIR}/gen.sh" initramfs-gentoo
+}
+
+src_install() {
+	dodir /boot
+	insinto /boot
+	newins initramfs-gentoo initramfs-gentoo
+}
-- 
cgit v1.2.3