From fded1028501c23402ee386b09dfde268dfafe1e6 Mon Sep 17 00:00:00 2001 From: Les Aker Date: Mon, 11 May 2015 15:20:50 -0400 Subject: [PATCH] handle kvm --- initcpio/hooks/dock0 | 8 +++++++- initcpio/hooks/lvm-dock0 | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/initcpio/hooks/dock0 b/initcpio/hooks/dock0 index 35a9892..411ddf4 100644 --- a/initcpio/hooks/dock0 +++ b/initcpio/hooks/dock0 @@ -5,7 +5,13 @@ run_hook() { dock0_mount_handler() { local newroot="$1" - local root="${root:=/dev/xvda}" + if [ -e /dev/xvda ] ; then + local defaultroot="/dev/xvda" + else + local defaultroot="/dev/sda" + fi + + local root="${root:=${defaultroot}}" local basepath="${basepath:=/run/vm}" local rootfspath="${rootfspath:=latest/vm_root}" local cowspace="${cowspace:=/dev/mapper/luks-cowspace}" diff --git a/initcpio/hooks/lvm-dock0 b/initcpio/hooks/lvm-dock0 index 6b14482..c9b3fbf 100644 --- a/initcpio/hooks/lvm-dock0 +++ b/initcpio/hooks/lvm-dock0 @@ -21,8 +21,14 @@ create_lv() { } run_earlyhook() { + if [ -e /dev/xvda ] ; then + local defaultpv="/dev/xvda" + else + local defaultpv="/dev/sda" + fi + local vg="${vg:=dock0}" - local pv="${pv:=/dev/xvdb}" + local pv="${pv:=${defaultpv}}" mkdir /run/lvm lvmetad