From f65fe75823f046e1813e129009f0619f074b4edc Mon Sep 17 00:00:00 2001
From: Trammell Hudson <hudson@trmm.net>
Date: Fri, 28 Oct 2016 04:57:11 -0400
Subject: [PATCH] simplify startup arguments for qubes r3.2

---
 initrd/start-xen | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/initrd/start-xen b/initrd/start-xen
index 80381352..7c4623eb 100755
--- a/initrd/start-xen
+++ b/initrd/start-xen
@@ -1,11 +1,11 @@
 #!/bin/sh
-mount -o ro -t ext4 /dev/sda2 /boot
+mount -o ro -t ext4 /dev/sda1 /boot
 
 die() { echo >&2 "$*"; exit 1; }
 
 XEN=/boot/xen-4.6.3.gz
-INITRD=/boot/initramfs-4.4.12-9.pvops.qubes.x86_64.img
-KERNEL=/boot/vmlinuz-4.4.12-9.pvops.qubes.x86_64
+INITRD=/boot/initramfs-4.4.14-11.pvops.qubes.x86_64.img
+KERNEL=/boot/vmlinuz-4.4.14-11.pvops.qubes.x86_64
 
 echo "+++ Checking $XEN"
 gpgv "${XEN}.asc" "${XEN}" || die "Xen signature failed"
@@ -22,7 +22,7 @@ gpgv "${KERNEL}.asc" "${KERNEL}" || die "Kernel signature failed"
 
 kexec \
 	-l \
-	--module "${KERNEL} placeholder root=/dev/mapper/luks-886ba0fa-8a51-4780-91bf-06c5944baab4 ro rd.luks.uuid=luks-886ba0fa-8a51-4780-91bf-06c5944baab4 rd.lvm.lv=qubes_dom0/00 rd.luks.uuid=luks-28948c05-c995-466c-91a2-bd517a7dd50f rd.lvm.lv=qubes_dom0/02 i915.preliminary_hw_support=1 rhgb" \
+	--module "${KERNEL} root=LABEL=root rhgb" \
 	--module "${INITRD}" \
 	--command-line "no-real-mode reboot=no console=vga dom0_mem=min:1024M dom0_mem=max:4096M" \
 	"${XEN}"