Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 18 insertions, 7 deletions

diff --git a/packages/initrdscripts/files/00-psplash.sh b/packages/initrdscripts/files/00-psplash.sh
index 491fe13fc3..db8aabedd7 100644
--- a/packages/initrdscripts/files/00-psplash.sh
+++ b/packages/initrdscripts/files/00-psplash.sh
@@ -1,4 +1,6 @@
-mkdir -p /mnt/.psplash
-mount tmpfs -t tmpfs /mnt/.psplash -o,size=40k
+if ! grep -Eq '\s?psplash=false\s?' /proc/cmdline; then
+	mkdir -p /mnt/.psplash
+	mount tmpfs -t tmpfs /mnt/.psplash -o,size=40k
 
-psplash &
+	psplash &
+fi
diff --git a/packages/initrdscripts/files/80-ext3.sh b/packages/initrdscripts/files/80-ext3.sh
index ed1909947b..1f52d391fa 100644
--- a/packages/initrdscripts/files/80-ext3.sh
+++ b/packages/initrdscripts/files/80-ext3.sh
@@ -1,7 +1,7 @@
 ext3_mount () {
 	modprobe -q ext3
 
-	mkdir $2
+	mkdir -p $2
 	mount -t ext3 -onoatime,data=journal,errors=continue $1 $2
 }
 
diff --git a/packages/initrdscripts/files/98-aufs.sh b/packages/initrdscripts/files/98-aufs.sh
index df05418c57..5f7cc11432 100644
--- a/packages/initrdscripts/files/98-aufs.sh
+++ b/packages/initrdscripts/files/98-aufs.sh
@@ -1,7 +1,7 @@
 aufs_mount () {
 	modprobe -q aufs
 
-	mkdir $2 /mnt
+	mkdir -p $2 /mnt
 	mount -t aufs -o br:$1:$2 none /mnt
 }
 
diff --git a/packages/initrdscripts/files/99-psplash.sh b/packages/initrdscripts/files/99-psplash.sh
index fa488cff8b..3d5f1d60d1 100644
--- a/packages/initrdscripts/files/99-psplash.sh
+++ b/packages/initrdscripts/files/99-psplash.sh
@@ -1,2 +1,4 @@
-mkdir -p /mnt/mnt/.psplash
-mount -n -o move /mnt/.psplash /mnt/mnt/.psplash
+if ! grep -Eq '\s?psplash=false\s?' /proc/cmdline; then
+	mkdir -p /mnt/mnt/.psplash
+	mount -n -o move /mnt/.psplash /mnt/mnt/.psplash
+fi
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 5cdbab5e0d..221b8f56b9 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -35,10 +35,16 @@ read_args() {
                 ROOT_FSTYPE=$optarg ;;
             rootdelay=*)
                 rootdelay=$optarg ;;
+            debug) set -x ;;
+            shell) sh ;;
         esac
     done
 }
 
+do_depmod() {
+	[ -e "/lib/modules/$(uname -r)/modules.dep" ] || depmod
+}
+
 load_module() {
     # Cannot redir to $CONSOLE here easily - may not be set yet
     echo "initramfs: Loading $module module"
@@ -66,6 +72,7 @@ fatal() {
 echo "Starting initramfs boot..."
 early_setup
 load_modules '0*'
+do_depmod
 
 [ -z "$CONSOLE" ] && CONSOLE="/dev/console"