From 84a2eb54514dc351796368e1c6bbc40a86c93b19 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 26 Dec 2012 00:54:02 +0100 Subject: preseed hostnames too and only either preseed debian-edu-install/profile or debian-edu-install/profile-expert --- .../debian-edu_squeeze-test_combi-server_preseed.cfg | 10 +++++----- .../debian-edu_squeeze-test_standalone_preseed.cfg | 10 +++++----- .../debian-edu_squeeze-test_workstation_preseed.cfg | 10 +++++----- .../debian-edu_wheezy-test_combi-server_preseed.cfg | 10 +++++----- d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg | 10 +++++----- d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg | 10 +++++----- .../debian-edu_wheezy-test_workstation_preseed.cfg | 10 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) (limited to 'd-i-preseed-cfgs') diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg index b1202a78..1d5146a7 100644 --- a/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string tjener +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,11 +303,11 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) d-i debian-edu-install/profile-expert multiselect Main-Server, Workstation, Thin-Client-Server -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> -d-i debian-edu-install/profile multiselect Workstation +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) +# d-i debian-edu-install/profile multiselect Main-Server, Workstation, Thin-Client-Server d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg index 4c8e9d8b..5b05bbf4 100644 --- a/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string standalone +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,11 +303,11 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) d-i debian-edu-install/profile-expert multiselect Standalone -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> -d-i debian-edu-install/profile multiselect Standalone +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) +#d-i debian-edu-install/profile multiselect Standalone d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg b/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg index 037bf267..5f0a4858 100644 --- a/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string workstation +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,11 +303,11 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) d-i debian-edu-install/profile-expert multiselect Workstation -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> -d-i debian-edu-install/profile multiselect Workstation +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) +#d-i debian-edu-install/profile multiselect Workstation d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg index 53a5e2b5..04b93503 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string tjener +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,10 +303,10 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 -d-i debian-edu-install/profile-expert multiselect Main-Server, Workstation, Thin-Client-Server +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) +#d-i debian-edu-install/profile-expert multiselect Main-Server, Workstation, Thin-Client-Server -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) d-i debian-edu-install/profile multiselect Main-Server, Workstation, Thin-Client-Server d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg index be7ee710..addf7696 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string standalone +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,10 +303,10 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 -d-i debian-edu-install/profile-expert multiselect Standalone +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) +#d-i debian-edu-install/profile-expert multiselect Standalone -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) d-i debian-edu-install/profile multiselect Standalone d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg index f37873b2..1b1b5b20 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string sugar +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,10 +303,10 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 -d-i debian-edu-install/profile-expert multiselect Sugar +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) +#d-i debian-edu-install/profile-expert multiselect Sugar -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) d-i debian-edu-install/profile multiselect Sugar d-i debian-edu-install/confirm boolean true diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg index c62c11c1..1e2cebf7 100644 --- a/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg +++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg @@ -56,8 +56,8 @@ d-i netcfg/choose_interface select auto # Any hostname and domain names assigned from dhcp take precedence over # values set here. However, setting the values still prevents the questions # from being shown, even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain +d-i netcfg/get_hostname string workstation +d-i netcfg/get_domain string intern # Disable that annoying WEP key dialog. d-i netcfg/wireless_wep string @@ -303,10 +303,10 @@ d-i partman/confirm_nooverwrite boolean true # authentication. Warning: Insecure, not recommended. #d-i debian-installer/allow_unauthenticated boolean true -# Profile for debian-edu-install versions 1.519 - 1.528 -d-i debian-edu-install/profile-expert multiselect Workstation +# Profile for debian-edu-install versions 1.519 - 1.528 (squeeze) +#d-i debian-edu-install/profile-expert multiselect Workstation -# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> +# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy) d-i debian-edu-install/profile multiselect Workstation d-i debian-edu-install/confirm boolean true -- cgit v1.2.3-54-g00ecf