aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2015-03-19 17:11:08 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2015-03-19 17:11:08 -0400
commit56d05072e6225f95e523d735e3236e4461484a16 (patch)
tree577fe17cc6943a02b14986f4b3fafc8a6b49bfcc
parent68a87321df98baff8a2e14a4692bfe1175e6b66c (diff)
downloadkvm-manager-develop.tar.gz
kvm-manager-develop.tar.bz2
update to work with jessiedevelop
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.
-rwxr-xr-xdi-maker2
1 files changed, 1 insertions, 1 deletions
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
"