diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-19 13:02:38 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-19 13:02:38 +0100 |
| commit | 54efcb42bd7be12599f53d5a98623c35516955a3 (patch) | |
| tree | 5f352f48862f20477e046379bc80fd37b5650cc0 /d-i-preseed-cfgs | |
| parent | 8f9ccd3a2127c87ee3240e638b1c53816ff05d15 (diff) | |
| parent | e9b5d5af1fde52a271d0e4bee988e458d2b2de11 (diff) | |
| download | jenkins.debian.net-54efcb42bd7be12599f53d5a98623c35516955a3.tar.xz | |
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
Diffstat (limited to 'd-i-preseed-cfgs')
| -rw-r--r-- | d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg | 4 | ||||
| l--------- | d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg (renamed from d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg) | 0 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg | 5 | ||||
| l--------- | d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg (renamed from d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg) | 0 |
4 files changed, 4 insertions, 5 deletions
diff --git a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg index d70b5140..98d853a8 100644 --- a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg @@ -23,10 +23,10 @@ d-i keymap select us # netcfg will choose an interface that has link if possible. This makes it # skip displaying a list if there is more than one interface. -d-i netcfg/choose_interface select auto +#d-i netcfg/choose_interface select auto # To pick a particular interface instead: -#d-i netcfg/choose_interface select eth0 +d-i netcfg/choose_interface select eth0 # To set a different link detection timeout (default is 3 seconds). # Values are interpreted as seconds. diff --git a/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg index f5c7678a..f5c7678a 120000 --- a/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg diff --git a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg index c321dc2a..9922d8b0 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg @@ -11,8 +11,7 @@ d-i debian-installer/locale string en_US #d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8 # Keyboard selection. -# keymap is an alias for keyboard-configuration/xkb-keymap -d-i keymap select us +d-i keyboard-configuration/xkb-keymap select us # d-i keyboard-configuration/toggle select No toggling ### Network configuration @@ -310,7 +309,7 @@ tasksel tasksel/desktop multiselect xfce #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -d-i grub-installer/bootdev string /dev/ada +d-i grub-installer/bootdev string /dev/ada0 ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg index f5c7678a..f5c7678a 120000 --- a/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg +++ b/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg |