From 7dc74b94ec8864f4aa9d221816eadc054e090d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 2 Jun 2017 09:59:17 +0200
Subject: Add recovery mode for myinitramfs

---
 sys-boot/myinitramfs/files/init             |  8 +++++-
 sys-boot/myinitramfs/myinitramfs-1.0.ebuild | 40 -----------------------------
 sys-boot/myinitramfs/myinitramfs-1.1.ebuild | 40 +++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 41 deletions(-)
 delete mode 100644 sys-boot/myinitramfs/myinitramfs-1.0.ebuild
 create mode 100644 sys-boot/myinitramfs/myinitramfs-1.1.ebuild

(limited to 'sys-boot/myinitramfs')

diff --git a/sys-boot/myinitramfs/files/init b/sys-boot/myinitramfs/files/init
index 3cd6ce9..134d85c 100755
--- a/sys-boot/myinitramfs/files/init
+++ b/sys-boot/myinitramfs/files/init
@@ -29,7 +29,7 @@ fail() {
 	busybox --install -s
 	while true; do
 		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
+		# 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}"
@@ -44,6 +44,7 @@ busybox mount -t devtmpfs none /dev || fail "/dev mount failed!"
 # Now open and mount root
 root=""
 rootflags=""
+recovery=false
 
 for opt in $(cat /proc/cmdline); do
 	case "$opt" in
@@ -53,6 +54,9 @@ for opt in $(cat /proc/cmdline); do
 		rootflags=*)
 			rootflags=${opt:10}
 			;;
+		recovery)
+			recovery=true
+			;;
 		BOOT_IMAGE=*|initrd=*)
 			# Ignore those
 			;;
@@ -62,6 +66,8 @@ for opt in $(cat /proc/cmdline); do
 	esac
 done
 
+$recovery && fail "Requested recovery."
+
 [ -z "$root" ] && fail "Missing root argument!"
 
 echo -ne "${C_GRAY}Waiting for root ($root)..."
diff --git a/sys-boot/myinitramfs/myinitramfs-1.0.ebuild b/sys-boot/myinitramfs/myinitramfs-1.0.ebuild
deleted file mode 100644
index 9e8e999..0000000
--- a/sys-boot/myinitramfs/myinitramfs-1.0.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="My personal initramfs (verry simple with encryption support)"
-HOMEPAGE=""
-SRC_URI=""
-
-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="${DEPENDS}"
-
-src_unpack() {
-	# Well we have no sources so just create empty directory
-	mkdir -p "${S}"
-}
-
-src_compile() {
-	# TODO generate list dynamically
-	cp "${FILESDIR}"/list list
-	echo "file /init ${FILESDIR}/init 755 0 0" >> list
-	gen_init_cpio list > initramfs.cpio
-	gzip initramfs.cpio
-}
-
-src_install() {
-	dodir /boot
-	insinto /boot
-	newins initramfs.cpio.gz initramfs-gentoo
-}
diff --git a/sys-boot/myinitramfs/myinitramfs-1.1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.1.ebuild
new file mode 100644
index 0000000..9e8e999
--- /dev/null
+++ b/sys-boot/myinitramfs/myinitramfs-1.1.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+DESCRIPTION="My personal initramfs (verry simple with encryption support)"
+HOMEPAGE=""
+SRC_URI=""
+
+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="${DEPENDS}"
+
+src_unpack() {
+	# Well we have no sources so just create empty directory
+	mkdir -p "${S}"
+}
+
+src_compile() {
+	# TODO generate list dynamically
+	cp "${FILESDIR}"/list list
+	echo "file /init ${FILESDIR}/init 755 0 0" >> list
+	gen_init_cpio list > initramfs.cpio
+	gzip initramfs.cpio
+}
+
+src_install() {
+	dodir /boot
+	insinto /boot
+	newins initramfs.cpio.gz initramfs-gentoo
+}
-- 
cgit v1.2.3