From db5d22bd31a498aa24a74e2fec7faa3467fa42ad Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 17 Feb 2008 02:52:18 +0000 Subject: initramfs-uniboot: Modprobe mtdblock and factor out fatal(). --- packages/initrdscripts/files/init.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'packages/initrdscripts/files/init.sh') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index f8d5de9173..08163fa040 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -8,6 +8,7 @@ early_setup() { mkdir /proc mount -t proc proc /proc mkdir /mnt + modprobe -q mtdblock } dev_setup() @@ -48,13 +49,13 @@ boot_root() { exec switch_root -c /dev/console $BOOT_ROOT /sbin/init } -boot_failed() { - echo "No valid root device was specified. Please add root=/dev/something to" - echo "the kernel command-line and try again." +fatal() { + echo $1 echo exec sh } + echo "Starting initramfs boot..." early_setup read_args @@ -68,4 +69,5 @@ dev_setup load_modules [ -n "$BOOT_ROOT" ] && boot_root -boot_failed + +fatal "No valid root device was specified. Please add root=/dev/something to the kernel command-line and try again." -- cgit v1.2.3 From d1d941876523b687b4153a5f79e0b4f6c2d7fe5e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 17 Feb 2008 03:09:06 +0000 Subject: initramfs-uniboot: FSTYPE -> ROOT_FSTYPE, set from rootfstype= command line param. --- packages/initrdscripts/files/init.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/initrdscripts/files/init.sh') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 08163fa040..8b9fe12429 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -31,6 +31,8 @@ read_args() { case $arg in root=*) ROOT_DEVICE=$optarg ;; + rootfstype=*) + ROOT_FSTYPE=$optarg ;; rootdelay=*) rootdelay=$optarg ;; esac -- cgit v1.2.3