[oe-commits] Drew Moseley : init-install: Strip partition number from live_dev_name
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 2 08:30:33 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 9f6d7d42eaad225698de730d5c76bfe9523f4a78
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f6d7d42eaad225698de730d5c76bfe9523f4a78
Author: Drew Moseley <drew_moseley at mentor.com>
Date: Wed Jul 30 20:49:31 2014 -0400
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 at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 1 +
meta/recipes-core/initrdscripts/files/init-install.sh | 1 +
2 files changed, 2 insertions(+)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index b142ed4..70a2ee6 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 486c9f2..29587b0 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 ..."
More information about the Openembedded-commits
mailing list