summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2013-01-31 22:35:29 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-31 23:09:11 +0100
commita87b000e702c7eb461ffe1780f17944f171d5da1 (patch)
tree459930ccb9192b68fd79eaa7cae022bc52a86f40
parent29d2f90a38d799bc456424591a08c49ab7585ab5 (diff)
downloadjenkins.debian.net-a87b000e702c7eb461ffe1780f17944f171d5da1.tar.xz
Only preseed debian-edu-install/profile (and not debian-edu-install/profile-expert) for Wheezy.
-rw-r--r--d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg3
-rw-r--r--d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg3
-rw-r--r--d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg5
-rw-r--r--d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg3
-rw-r--r--d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg3
5 files changed, 1 insertions, 16 deletions
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 d833ef29..067afac4 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
@@ -303,9 +303,6 @@ 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 (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 -> higher (wheezy)
d-i debian-edu-install/profile multiselect Main-Server, Workstation, Thin-Client-Server
diff --git a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg b/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
index 5b73d44d..da1bf3dc 100644
--- a/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_wheezy-test_minimal_preseed.cfg
@@ -303,9 +303,6 @@ 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 (squeeze)
-#d-i debian-edu-install/profile-expert multiselect Minimal
-
# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy)
d-i debian-edu-install/profile multiselect Minimal
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 afe0ef58..b0ee5cec 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
@@ -303,11 +303,8 @@ 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 (squeeze)
-d-i debian-edu-install/profile-expert 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/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 9346086f..4538217b 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
@@ -303,9 +303,6 @@ 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 (squeeze)
-#d-i debian-edu-install/profile-expert multiselect Sugar
-
# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy)
d-i debian-edu-install/profile multiselect Sugar
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 43cdf744..a3b2ac6d 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
@@ -303,9 +303,6 @@ 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 (squeeze)
-#d-i debian-edu-install/profile-expert multiselect Workstation
-
# Profile for debian-edu-install versions 0.1 - 1.518, 1.529 -> higher (wheezy)
d-i debian-edu-install/profile multiselect Workstation