g-i edu: s#main+ltsp#combi# -server

10 files changed, 5 insertions, 5 deletions

diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
index eae4f78a..eae4f78a 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg
new file mode 120000
index 00000000..e145a115
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de15..00000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg
new file mode 120000
index 00000000..e145a115
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de15..00000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg
new file mode 120000
index 00000000..e145a115
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de15..00000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg
new file mode 120000
index 00000000..e145a115
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de15..00000000
--- a/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index fb302ca7..a6bac5cf 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -322,7 +322,7 @@
                                   my_title_extra: ' (Default)' }
             - standalone_mate:  { my_time: '23 2 4,18 * *', my_disksize: 25 }
             - main-server:      { my_time: '23 3 4,18 * *',   my_disksize: 40 }
-            - main+ltsp-server: { my_time: '42 0 4,18 * *',   my_disksize: 60 }
+            - combi-server: { my_time: '42 0 4,18 * *',   my_disksize: 60 }
 
       - '{name}_debian_{my_ver}_presentation':
           my_ver: