From 112674d9fcf5650783de1f2ab932d2a6c6401fb3 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Wed, 30 Jul 2014 20:49:31 -0400 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 1 + meta/recipes-core/initrdscripts/files/init-install.sh | 1 + 2 files changed, 2 insertions(+) (limited to 'meta/recipes-core/initrdscripts') 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 ..." -- cgit v1.2.3-54-g00ecf