summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:26:16 +0100
commit112674d9fcf5650783de1f2ab932d2a6c6401fb3 (patch)
tree6d43e421eafb136f3d53ff98a373dc5cdff141e2 /meta/recipes-core
parent7a81bd4c34b40badeb787d0b709ee832a9d1a891 (diff)
downloadpoky-112674d9fcf5650783de1f2ab932d2a6c6401fb3.tar.gz
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. (From OE-Core rev: 9f6d7d42eaad225698de730d5c76bfe9523f4a78) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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
17# Get a list of hard drives 17# Get a list of hard drives
18hdnamelist="" 18hdnamelist=""
19live_dev_name=${1%%/*} 19live_dev_name=${1%%/*}
20live_dev_name=${live_dev_name%%[0-9]*}
20 21
21echo "Searching for hard drives ..." 22echo "Searching for hard drives ..."
22 23
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
16# Get a list of hard drives 16# Get a list of hard drives
17hdnamelist="" 17hdnamelist=""
18live_dev_name=${1%%/*} 18live_dev_name=${1%%/*}
19live_dev_name=${live_dev_name%%[0-9]*}
19 20
20echo "Searching for hard drives ..." 21echo "Searching for hard drives ..."
21 22