summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-07-30 20:49:31 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:25:34 +0100
commit9f6d7d42eaad225698de730d5c76bfe9523f4a78 (patch)
tree1d23efc292a52843ce21971f45bd2d005c8ecd72
parent4abe5563f61a228963e1e442ebc2df9f2d01be80 (diff)
downloadopenembedded-core-contrib-9f6d7d42eaad225698de730d5c76bfe9523f4a78.tar.gz
openembedded-core-contrib-9f6d7d42eaad225698de730d5c76bfe9523f4a78.tar.bz2
openembedded-core-contrib-9f6d7d42eaad225698de730d5c76bfe9523f4a78.zip
init-install: Strip partition number from live_dev_name
This is needed in case the boot disk was created with mkdiskimage. In that case the parameter passed is a variant of /dev/sda4 which includes the partition number. Without this change this install script will offer to install onto the live media. Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh1
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index b142ed4915..70a2ee6073 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -17,6 +17,7 @@ swap_ratio=5
# Get a list of hard drives
hdnamelist=""
live_dev_name=${1%%/*}
+live_dev_name=${live_dev_name%%[0-9]*}
echo "Searching for hard drives ..."
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 486c9f2635..29587b0cc9 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -16,6 +16,7 @@ swap_ratio=5
# Get a list of hard drives
hdnamelist=""
live_dev_name=${1%%/*}
+live_dev_name=${live_dev_name%%[0-9]*}
echo "Searching for hard drives ..."