From 4bc26a55e65275522d0b9723901d9d198b5b6ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 2 Sep 2021 15:55:22 +0200
Subject: sys-boot/myinitramfs: try to fix issues

---
 sys-boot/myinitramfs/files/baselist              |  4 ++-
 sys-boot/myinitramfs/files/init.enc              |  6 ++--
 sys-boot/myinitramfs/myinitramfs-1.5.6-r1.ebuild | 45 ------------------------
 sys-boot/myinitramfs/myinitramfs-1.5.7-r1.ebuild | 45 ++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 48 deletions(-)
 delete mode 100644 sys-boot/myinitramfs/myinitramfs-1.5.6-r1.ebuild
 create mode 100644 sys-boot/myinitramfs/myinitramfs-1.5.7-r1.ebuild

diff --git a/sys-boot/myinitramfs/files/baselist b/sys-boot/myinitramfs/files/baselist
index 2461b72..692a560 100644
--- a/sys-boot/myinitramfs/files/baselist
+++ b/sys-boot/myinitramfs/files/baselist
@@ -6,6 +6,7 @@ dir /lib64	755 0 0
 dir /etc	755 0 0
 dir /dev	755 0 0
 dir /proc	755 0 0
+dir /run	755 0 0
 dir /sys	755 0 0
 dir /root	755 0 0
 dir /usr	755 0 0
@@ -15,8 +16,9 @@ dir /usr/lib64	755 0 0
 dir /mnt	755 0 0
 dir /mnt/root	755 0 0
 
-# Ld
+# Ld and gcc library
 file /lib64/ld-linux-x86-64.so.2	/lib64/ld-linux-x86-64.so.2	755 0 0
+file /usr/lib64/libgcc_s.so.1	/usr/lib64/libgcc_s.so.1 0 0
 
 # Busybox
 file /bin/busybox	/bin/busybox	755 0 0
diff --git a/sys-boot/myinitramfs/files/init.enc b/sys-boot/myinitramfs/files/init.enc
index 1fea03a..0f8c85d 100755
--- a/sys-boot/myinitramfs/files/init.enc
+++ b/sys-boot/myinitramfs/files/init.enc
@@ -31,8 +31,10 @@ fail() {
 		echo -e "${C_GRAY}Mount root to /mnt/root and exit shell to switch root.${C_NO}"
 		# Note: this is hack to enable job control
 		setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
-		echo
-		exec switch_root /mnt/root /sbin/init || echo -e "${C_RED}Root switch failed!${C_NO}"
+		if [ -f /mnt/root/sbin/init ]; then
+			exec switch_root /mnt/root /sbin/init
+		fi
+		echo -e "${C_RED}Are you sure that you mounted root filesystem?${C_NO}"
 	done
 }
 
diff --git a/sys-boot/myinitramfs/myinitramfs-1.5.6-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.5.6-r1.ebuild
deleted file mode 100644
index 2cb3f91..0000000
--- a/sys-boot/myinitramfs/myinitramfs-1.5.6-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.7-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.5.7-r1.ebuild
new file mode 100644
index 0000000..2cb3f91
--- /dev/null
+++ b/sys-boot/myinitramfs/myinitramfs-1.5.7-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