From 1964b697ddadc59e27087f9f1f6b24236f4addcc Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Thu, 21 May 2015 19:28:34 +0500 Subject: initrdscripts: make boot drive detection more generic The init script that invokes install and install-efi scripts passes the first parameter that identifies the boot drive but in cases when this disk is labeled and kernel configurations allow disk labeling under /run/media/ this would pass the disk label. The earlier implementation considered that the drive name will be passed and in case the label is passed it fails and provides the boot drive as an option for installation driver. We now use a more generic approach to identify the boot drive which can handle both drive name as well as label if passed. Signed-off-by: Awais Belal Signed-off-by: Ross Burton --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 3 ++- meta/recipes-core/initrdscripts/files/init-install.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 329586d74d..8dd2749b5e 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -16,7 +16,8 @@ swap_ratio=5 # Get a list of hard drives hdnamelist="" -live_dev_name=${1%%/*} +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} 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 fb537ee310..cb261630d0 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -15,7 +15,8 @@ swap_ratio=5 # Get a list of hard drives hdnamelist="" -live_dev_name=${1%%/*} +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} live_dev_name=${live_dev_name%%[0-9]*} echo "Searching for hard drives ..." -- cgit 1.2.3-korg