65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From c204501e3eaf31a69ef69aa567f5d3c88f69c66a Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Tue, 3 Jul 2012 13:14:12 +0200
|
|
Subject: [PATCH] base/init.sh: error out early, if /dev, /proc or /sys cannot
|
|
be mounted
|
|
|
|
---
|
|
modules.d/99base/init.sh | 25 ++++++++++++++++++++-----
|
|
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
|
index d395a99..3eb6424 100755
|
|
--- a/modules.d/99base/init.sh
|
|
+++ b/modules.d/99base/init.sh
|
|
@@ -20,14 +20,22 @@ export PATH
|
|
RD_DEBUG=""
|
|
. /lib/dracut-lib.sh
|
|
|
|
-trap "emergency_shell Signal caught!" 0
|
|
-
|
|
# mount some important things
|
|
[ ! -d /proc/self ] && \
|
|
- mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null 2>&1
|
|
+ mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null
|
|
+
|
|
+if [ "$?" != "0" ]; then
|
|
+ echo "Cannot mount proc on /proc! Compile the kernel with CONFIG_PROC_FS!"
|
|
+ exit 1
|
|
+fi
|
|
|
|
[ ! -d /sys/kernel ] && \
|
|
- mount -t sysfs -o nosuid,noexec,nodev sysfs /sys >/dev/null 2>&1
|
|
+ mount -t sysfs -o nosuid,noexec,nodev sysfs /sys >/dev/null
|
|
+
|
|
+if [ "$?" != "0" ]; then
|
|
+ echo "Cannot mount sysfs on /sys! Compile the kernel with CONFIG_SYSFS!"
|
|
+ exit 1
|
|
+fi
|
|
|
|
if [ -x /lib/systemd/systemd-timestamp ]; then
|
|
RD_TIMESTAMP=$(/lib/systemd/systemd-timestamp)
|
|
@@ -39,7 +47,12 @@ fi
|
|
setdebug
|
|
|
|
if ! ismounted /dev; then
|
|
- mount -t devtmpfs -o mode=0755,nosuid,strictatime devtmpfs /dev >/dev/null
|
|
+ mount -t devtmpfs -o mode=0755,nosuid,strictatime devtmpfs /dev >/dev/null
|
|
+fi
|
|
+
|
|
+if ! ismounted /dev; then
|
|
+ echo "Cannot mount devtmpfs on /dev! Compile the kernel with CONFIG_DEVTMPFS!"
|
|
+ exit 1
|
|
fi
|
|
|
|
# prepare the /dev directory
|
|
@@ -66,6 +79,8 @@ if ! ismounted /run; then
|
|
rm -fr /newrun
|
|
fi
|
|
|
|
+trap "emergency_shell Signal caught!" 0
|
|
+
|
|
[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
|
|
|
|
UDEVVERSION=$(udevadm --version)
|