From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Mar 2015 21:11:08 +0000 (-0400)
Subject: update to work with jessie
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=refs%2Fheads%2Fdevelop;p=kvm-manager.git

update to work with jessie

around 3.15, the linux kernel stopped parsing arguments passed to it
after a -- argument:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=51e158c12aca3c9ac63988611a97c05109b14dc9

This breaks the usual debian-installer approach of putting kernel
arguments that you want to persist in the install after the --
argument.

We work around this by just putting the arguments we want to persist
both before and after the --.  yuck.
---

diff --git a/di-maker b/di-maker
index e5247dd..e24df35 100755
--- a/di-maker
+++ b/di-maker
@@ -48,7 +48,7 @@ esac
 KERNEL=linux
 INITRAMFS=initrd.gz
 BOOTINSTRUCTIONS="
-  linux /$KERNEL verbose -- console=ttyS0,115200n8 
+  linux /$KERNEL verbose console=ttyS0,115200n8 -- console=ttyS0,115200n8 
   initrd /$INITRAMFS
 "