summaryrefslogtreecommitdiff
path: root/packages/initrdscripts/files
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-02-17 03:09:06 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-02-17 03:09:06 +0000
commitd1d941876523b687b4153a5f79e0b4f6c2d7fe5e (patch)
treea45cf6bbd1a1c48c5cb77a4c664988eeea7c0b48 /packages/initrdscripts/files
parent71a0ef43a6bf3c9eabc5ca4b9bd62229e574015d (diff)
initramfs-uniboot: FSTYPE -> ROOT_FSTYPE, set from rootfstype= command line param.
Diffstat (limited to 'packages/initrdscripts/files')
-rw-r--r--packages/initrdscripts/files/30-bootmenu.sh2
-rw-r--r--packages/initrdscripts/files/85-blockboot.sh4
-rw-r--r--packages/initrdscripts/files/init.sh2
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index a45b55a353..3f3b8c7079 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -157,7 +157,7 @@ else
ROOT_DEVICE="/dev/$dev"
# jffs2 is not recognized by mount automagically
if [ "$fstype" == "(jffs2)" ]; then
- FSTYPE="jffs2"
+ ROOT_FSTYPE="jffs2"
fi
CMDLINE="$CMDLINE root=$ROOT_DEVICE"
fi
diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh
index fee9072d3a..e1c3ed893e 100644
--- a/packages/initrdscripts/files/85-blockboot.sh
+++ b/packages/initrdscripts/files/85-blockboot.sh
@@ -4,8 +4,8 @@
if [ -e "$ROOT_DEVICE" ]; then
echo "booting from: $ROOT_DEVICE"
type=""
- if [ -n "$FSTYPE" ]; then
- type="-t $FSTYPE"
+ if [ -n "$ROOT_FSTYPE" ]; then
+ type="-t $ROOT_FSTYPE"
fi
mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
BOOT_ROOT=/mnt
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