summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2014-11-13 13:22:08 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2014-11-13 13:22:08 +0100
commit3eb6d5bafd1b97255ec45c843a2522dc07bdea6d (patch)
tree8faf907ae82391410941e4f4b769b3456de7ed0e /bin
parent638355a2b83d54c525003edba0025ae173b396a0 (diff)
parent975d424fb8b4ddfeafce503746511a98b21cc5dd (diff)
downloadjenkins.debian.net-3eb6d5bafd1b97255ec45c843a2522dc07bdea6d.tar.xz
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
Diffstat (limited to 'bin')
-rw-r--r--bin/g-i-installation.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index f4775c12..c5fe981d 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -235,7 +235,7 @@ bootstrap_system() {
else
QEMU_KERNEL="--kernel $KERNEL --initrd $INITRD"
fi
- QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE $QEMU_NET_OPTS"
+ QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -serial file:$RESULTS/serial.log -m $RAMSIZE $QEMU_NET_OPTS"
INST_LOCALE="locale=$DI_LOCALE"
INST_KEYMAP="keymap=us" # always us!
INST_VIDEO="video=vesa:ywrap,mtrr vga=788"