diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-13 13:22:08 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-13 13:22:08 +0100 |
| commit | 3eb6d5bafd1b97255ec45c843a2522dc07bdea6d (patch) | |
| tree | 8faf907ae82391410941e4f4b769b3456de7ed0e | |
| parent | 638355a2b83d54c525003edba0025ae173b396a0 (diff) | |
| parent | 975d424fb8b4ddfeafce503746511a98b21cc5dd (diff) | |
| download | jenkins.debian.net-3eb6d5bafd1b97255ec45c843a2522dc07bdea6d.tar.xz | |
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
| -rw-r--r-- | bin/g-i-installation.sh | 2 | ||||
| -rw-r--r-- | etc/apache2/conf.d/munin | 2 |
2 files changed, 2 insertions, 2 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" diff --git a/etc/apache2/conf.d/munin b/etc/apache2/conf.d/munin index e81528d7..feb4e9fd 100644 --- a/etc/apache2/conf.d/munin +++ b/etc/apache2/conf.d/munin @@ -96,7 +96,7 @@ ExtendedStatus On Order deny,allow Deny from all Allow from 127.0.0.1 - Allow from 46.16.77.49 + Allow from 46.16.73.183 </Location> </IfModule> |