From 9e5eb4dd9efec28830e3743082d021aed7d70ddf Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 2 Dec 2012 17:14:00 +0100 Subject: force keymap harder and use us --- bin/cd_tester.sh | 4 ++-- userContent/lxde-wheezy-preseed.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index b1850307..af473d1e 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -75,11 +75,11 @@ bootstrap() { case $NAME in debian-edu-wheezy) echo "fire up qemu now..." - sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & + sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; lxde-wheezy) echo "fire up qemu now..." - sudo qemu-system-x86_64 -hda $NAME.qcow -boot c -m 1024 -display vnc=localhost:$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD & + sudo qemu-system-x86_64 -hda $NAME.qcow -boot c -m 1024 -display vnc=localhost:$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD & # wheezy: qemu-system-x86_64 -cdrom debian-6.0.6-amd64-businesscard.iso -hda debian.qcow -boot d -m 2048 -display vnc=localhost:1 --kernel /mnt/install.amd/vmlinuz --append "auto=true priority=critical url=http://10.0.2.2/userContent/preseed.cfg vga=788 initrd=/install.amd/initrd.gz" --initrd /mnt/install.amd/initrd.gz # kernel /install.amd/vmlinuz # append desktop=lxde video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet diff --git a/userContent/lxde-wheezy-preseed.cfg b/userContent/lxde-wheezy-preseed.cfg index 7be61156..1b97f968 100644 --- a/userContent/lxde-wheezy-preseed.cfg +++ b/userContent/lxde-wheezy-preseed.cfg @@ -1,7 +1,7 @@ #### Contents of the preconfiguration file (for wheezy) ### Localization # Preseeding only locale sets language, country and locale. -d-i debian-installer/locale string de_DE +d-i debian-installer/locale string en_US # The values can also be preseeded individually for greater flexibility. #d-i debian-installer/language string en -- cgit v1.2.3-54-g00ecf