From 472ffd35c0a5d8b9d4d678a3ab5117722cccf2ae Mon Sep 17 00:00:00 2001
From: Francis Lam <flam@alum.mit.edu>
Date: Sun, 30 Jul 2017 17:33:26 -0400
Subject: [PATCH] Moved kernel command line parameters to config

---
 config/x230-generic.config | 2 ++
 initrd/bin/kexec-boot      | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/x230-generic.config b/config/x230-generic.config
index 966fdd29..373a090b 100644
--- a/config/x230-generic.config
+++ b/config/x230-generic.config
@@ -22,5 +22,7 @@ CONFIG_BOOTSCRIPT=/bin/generic-init
 
 CONFIG_BOOT_REQ_HASH=n
 CONFIG_BOOT_REQ_ROLLBACK=n
+CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
+CONFIG_BOOT_KERNEL_REMOVE="quiet"
 CONFIG_BOOT_DEV="/dev/sda1"
 CONFIG_USB_BOOT_DEV="/dev/sdb1"
diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot
index 71a4e944..362354af 100755
--- a/initrd/bin/kexec-boot
+++ b/initrd/bin/kexec-boot
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Launches kexec from saved configuration entries
 set -e -o pipefail
+. /etc/config
 . /etc/functions
 
 dryrun="n"
@@ -28,9 +29,8 @@ kexectype=`echo $entry | cut -d\| -f2`
 kexecparams=`echo $entry | cut -d\| -f3- | tr '|' '\n'`
 kexeccmd="kexec"
 
-# TODO: make this configurable
-cmdadd="intel_iommu=on $cmdadd"
-cmdremove="quiet $cmdremove"
+cmdadd="$CONFIG_BOOT_KERNEL_ADD $cmdadd"
+cmdremove="$CONFIG_BOOT_KERNEL_REMOVE $cmdremove"
 
 fix_file_path() {
 	if [ "$printfiles" = "y" ]; then