summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-02-26 09:19:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 14:01:11 +0000
commitd9d6f01aa706796e45de3597676e65d1dd583342 (patch)
tree1f64ccd8176f2049797e494b128821d2cbff2e8e
parentad30740b129abd3ac18dd227d36294840856c3ac (diff)
downloadpoky-d9d6f01aa706796e45de3597676e65d1dd583342.tar.gz
poky-d9d6f01aa706796e45de3597676e65d1dd583342.tar.bz2
poky-d9d6f01aa706796e45de3597676e65d1dd583342.zip
initrdscripts: Add rootimage option
This allows for setting the ROOT_IMAGE name on the kernel command line [YOCTO #5387] (From OE-Core rev: 00e3acde7910a5fb1d2e6b71187f2d9283319e71) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 7e27f91f9e..9e53a25a51 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -49,6 +49,8 @@ read_args() {
case $arg in
root=*)
ROOT_DEVICE=$optarg ;;
+ rootimage=*)
+ ROOT_IMAGE=$optarg ;;
rootfstype=*)
modprobe $optarg 2> /dev/null ;;
LABEL=*)
@@ -133,7 +135,7 @@ do
mount | grep media
echo "Available block devices"
ls /dev/sd*
- fatal "Cannot find rootfs.img file in /media/* , dropping to a shell "
+ fatal "Cannot find $ROOT_IMAGE file in /media/* , dropping to a shell "
fi
C=$(( C + 1 ))
fi