From aaf8a26454415a9d0693c29abc8489aaf6ebb3bf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 20 Feb 2009 20:29:55 -0300 Subject: initramfs-module-ext3: use mkdir -p to create mount path --- packages/initrdscripts/files/80-ext3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/initrdscripts/files') 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 } -- cgit v1.2.3 From 3881ea711293c84a10757b01d768483ed8a9f4c2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 20 Feb 2009 20:31:00 -0300 Subject: initramfs-module-aufs: use mkdir -p to create mount path --- packages/initrdscripts/files/98-aufs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/initrdscripts/files') 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 } -- cgit v1.2.3 From 83ab7056b38ea95541629897a1077651a64a0068 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 20 Feb 2009 20:32:09 -0300 Subject: initramfs-uniboot: add support to start a shell and enable debug To start a shell, you just need to use 'shell' boot param while to enable shell debugging use 'debug'. --- packages/initrdscripts/files/init.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/initrdscripts/files') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 5cdbab5e0d..65fef262b6 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -35,6 +35,8 @@ read_args() { ROOT_FSTYPE=$optarg ;; rootdelay=*) rootdelay=$optarg ;; + debug) set -x ;; + shell) sh ;; esac done } -- cgit v1.2.3 From 0b7903ed229c1bb2fe93e4253c7dfdeb19f660b2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 20 Feb 2009 20:35:58 -0300 Subject: initramfs-uniboot: call depmod if the image lack a dep file --- packages/initrdscripts/files/init.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages/initrdscripts/files') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 65fef262b6..221b8f56b9 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -41,6 +41,10 @@ read_args() { 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" @@ -68,6 +72,7 @@ fatal() { echo "Starting initramfs boot..." early_setup load_modules '0*' +do_depmod [ -z "$CONSOLE" ] && CONSOLE="/dev/console" -- cgit v1.2.3 From 6fb58774bcf7e9bbfd3f3ff25d134269f402539e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 23 Feb 2009 14:16:30 -0300 Subject: initramfs-module-psplash: allow psplash to be disabled using boot param Add support to disable psplash using boot param as done for regular psplash package. To disable it, use 'psplash=false' as boot param. --- packages/initrdscripts/files/00-psplash.sh | 8 +++++--- packages/initrdscripts/files/99-psplash.sh | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'packages/initrdscripts/files') 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/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 -- cgit v1.2.3