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 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'sys-boot/myinitramfs/files')

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
 }
 
-- 
cgit v1.2.3