From d671df5919be8c7878d5a56573af0792cd39781f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 13 Nov 2014 09:21:56 +0100 Subject: g-i hurd: Disable dma on hd0 --- bin/g-i-installation.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 7234800e..d1a27c84 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -314,6 +314,11 @@ bootstrap_system() { *_kfreebsd) ;; *_hurd*) # Hurd needs multiboot options jenkins can't escape correctly echo -n '--kernel '$WORKSPACE'/gnumach --initrd "'$IMAGE_MNT'/boot/initrd.gz \$(ramdisk-create),'$IMAGE_MNT'/boot/kernel/ext2fs.static --multiboot-command-line=\${kernel-command-line} --host-priv-port=\${host-port} --device-master-port=\${device-port} --exec-server-task=\${exec-task} -T typed gunzip:device:rd0 \$(task-create) \$(task-resume),'$IMAGE_MNT'/boot/kernel/ld.so.1 /hurd/exec \$(exec-task=task-create)" ' >> $QEMU_LAUNCHER + # The slow qemu emulation brings IRQ + # timeouts, so rather avoid them + # completely, in qemu PIO is actually + # not slower than DMA anyway. + APPEND="hd0=nodma $APPEND" ;; *) ;; esac -- cgit v1.2.3-70-g09d2 From 40a6457a1c9d445c4f9a65afd372c3ce69dbc5d5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 13 Nov 2014 09:27:35 +0100 Subject: g-i hurd: redirect kernel and syslog to serial port --- bin/g-i-installation.sh | 2 +- d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index d1a27c84..f4775c12 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -318,7 +318,7 @@ bootstrap_system() { # timeouts, so rather avoid them # completely, in qemu PIO is actually # not slower than DMA anyway. - APPEND="hd0=nodma $APPEND" + APPEND="hd0=nodma console=dom0 $APPEND" ;; *) ;; esac diff --git a/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg index b8d822c5..9cb53f7e 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg @@ -362,6 +362,7 @@ d-i debian-installer/exit/poweroff boolean true # This first command is run as early as possible, just after # preseeding is read. #d-i preseed/early_command string anna-install some-udeb +d-i preseed/early_command string sed -ie s/tty4/com0/ /etc/inittab ; kill -HUP 1 # This command is run immediately before the partitioner starts. It may be # useful to apply dynamic partitioner preseeding that depends on the state # of the disks (which may not be visible when preseed/early_command runs). -- cgit v1.2.3-70-g09d2 From 8cd85f471c01d2c5aaeea2578842b062593b648e Mon Sep 17 00:00:00 2001 From: Steven Chamberlain Date: Wed, 12 Nov 2014 18:57:59 +0000 Subject: g-i: log serial console to a file artifact --- bin/g-i-installation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3-70-g09d2 From 975d424fb8b4ddfeafce503746511a98b21cc5dd Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 13 Nov 2014 12:21:09 +0100 Subject: update for new IP --- etc/apache2/conf.d/munin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-70-g09d2