From b918a3b96f633ed0e6945f1ee983804737e18064 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 4 Jan 2015 13:18:12 +0100 Subject: Revert "g-i: dont preseed boot-device anymore, now that #759737 is fixed" This reverts commit 23983949e92596ea85662cf7b528f8bbd31b0ae4. --- d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg | 2 +- d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg | 2 +- d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg | 2 +- d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_sid_daily_lxde_preseed.cfg | 2 +- d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'd-i-preseed-cfgs') 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 913aafea..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 @@ -389,7 +389,7 @@ d-i debian-installer/exit/poweroff boolean true d-i debian-edu-install/participate-popcon boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda # Tell LTSP to not use the CDROM, but a HTTP mirror d-i ltsp-client-builder/use_cdrom boolean false diff --git a/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg index 65196a42..40098fb5 100644 --- a/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg @@ -388,7 +388,7 @@ d-i debian-installer/exit/poweroff boolean true d-i debian-edu-install/participate-popcon boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda rpcbind rpcbind/loopback boolean false diff --git a/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg index d014576b..ded1447f 100644 --- a/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg @@ -388,7 +388,7 @@ d-i debian-installer/exit/poweroff boolean true d-i debian-edu-install/participate-popcon boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda rpcbind rpcbind/loopback boolean false diff --git a/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg index d014576b..ded1447f 100644 --- a/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg @@ -388,7 +388,7 @@ d-i debian-installer/exit/poweroff boolean true d-i debian-edu-install/participate-popcon boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda rpcbind rpcbind/loopback boolean false diff --git a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg index b52fa0c7..4ed025a3 100644 --- a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg @@ -319,7 +319,7 @@ tasksel tasksel/first multiselect standard, desktop #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg index ccafd451..ed3a0937 100644 --- a/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg @@ -320,7 +320,7 @@ tasksel tasksel/desktop multiselect kde #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg index f3cf564c..b1d5e293 100644 --- a/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg @@ -320,7 +320,7 @@ tasksel tasksel/desktop multiselect lxde #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg index b7f09b4b..e420e6fc 100644 --- a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg @@ -320,7 +320,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/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg index b52fa0c7..4ed025a3 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg @@ -319,7 +319,7 @@ tasksel tasksel/first multiselect standard, desktop #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles 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 6383ab89..d20e7e7a 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 @@ -379,5 +379,5 @@ d-i preseed/late_command string apt-install xdm; echo /usr/bin/xdm >/target/etc/ # To install grub to multiple disks: #d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0) # To install to a particular device: -##d-i grub-installer/bootdev string /dev/sda +#d-i grub-installer/bootdev string /dev/sda d-i grub-installer/bootdev string /dev/hd0 diff --git a/d-i-preseed-cfgs/debian_sid_daily_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_lxde_preseed.cfg index 5215461e..76cf8894 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_lxde_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_lxde_preseed.cfg @@ -320,7 +320,7 @@ tasksel tasksel/desktop multiselect lxde #popularity-contest popularity-contest/participate boolean false # install grub on the first disk found -#d-i grub-installer/bootdev string /dev/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles diff --git a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg index b7f09b4b..e420e6fc 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg @@ -320,7 +320,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/sda +d-i grub-installer/bootdev string /dev/sda ### Finishing up the installation # During installations from serial console, the regular virtual consoles -- cgit v1.2.3-70-g09d2