summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf8
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf18
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf9
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf10
-rw-r--r--examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf11
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf2
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf6
-rw-r--r--examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf2
-rw-r--r--examples/backup/master.conf.dirvish39
-rw-r--r--examples/disklserver/README.tftp10
-rw-r--r--examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg158
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start47
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init26
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home30
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home53
-rwxr-xr-xexamples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop25
-rw-r--r--examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions66
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg4
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg4
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg5
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg13
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/memtest.cfg6
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg3
-rw-r--r--examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg4
l---------examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img1
l---------examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz1
l---------examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img1
l---------examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz1
l---------examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.01
l---------examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.01
l---------examples/disklserver/tftp/_common_/syslinux/jessie/syslinux1
l---------examples/disklserver/tftp/_common_/syslinux/stretch/syslinux1
l---------examples/disklserver/tftp/_common_/x2go/i386/initrd.img1
l---------examples/disklserver/tftp/_common_/x2go/i386/vmlinuz1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg17
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg7
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/ltsp1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.01
l---------examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/diskless+localdisk+x2go/syslinux1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg16
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/diskless+x2go/ltsp1
l---------examples/disklserver/tftp/diskless+x2go/pxelinux.01
l---------examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/diskless+x2go/syslinux1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg1
l---------examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/mint+x2go/ltsp1
l---------examples/disklserver/tftp/mint+x2go/pxelinux.01
l---------examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/mint+x2go/syslinux1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/skolelinux+x2go/ltsp1
l---------examples/disklserver/tftp/skolelinux+x2go/pxelinux.01
l---------examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/skolelinux+x2go/syslinux1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/ubuntu+x2go/ltsp1
l---------examples/disklserver/tftp/ubuntu+x2go/pxelinux.01
l---------examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/ubuntu+x2go/syslinux1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg15
l---------examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/windows+x2go/ltsp1
l---------examples/disklserver/tftp/windows+x2go/pxelinux.01
l---------examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default1
l---------examples/disklserver/tftp/windows+x2go/syslinux1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg13
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin1
l---------examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg1
l---------examples/disklserver/tftp/x2go-tce/ltsp1
l---------examples/disklserver/tftp/x2go-tce/pxelinux.01
l---------examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default1
l---------examples/disklserver/tftp/x2go-tce/syslinux1
-rw-r--r--examples/disklserver/x2gothinclient-settings.conf61
-rw-r--r--examples/displayserver/README.tftp10
-rw-r--r--examples/displayserver/tftp/_common_/debian-edu/display.cfg5
-rw-r--r--examples/displayserver/tftp/_common_/debian-edu/memtest.cfg6
l---------examples/displayserver/tftp/_common_/display/amd64/initrd.img1
l---------examples/displayserver/tftp/_common_/display/amd64/vmlinuz1
l---------examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.01
l---------examples/displayserver/tftp/_common_/syslinux/jessie/syslinux1
l---------examples/displayserver/tftp/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/displayserver/tftp/debian-edu/default-menu.cfg12
l---------examples/displayserver/tftp/debian-edu/display.cfg1
l---------examples/displayserver/tftp/debian-edu/memtest.cfg1
l---------examples/displayserver/tftp/debian-edu/memtest86+.bin1
l---------examples/displayserver/tftp/debian-edu/memtest86.bin1
l---------examples/displayserver/tftp/display1
l---------examples/displayserver/tftp/pxelinux.01
l---------examples/displayserver/tftp/pxelinux.cfg/default1
l---------examples/displayserver/tftp/syslinux1
-rw-r--r--examples/mainserver/README.tftp17
l---------examples/mainserver/tftp/debian-edu/debian-edu-splash.png1
-rw-r--r--examples/mainserver/tftp/debian-edu/default-menu.cfg14
-rw-r--r--examples/mainserver/tftp/debian-edu/install-de8.cfg13
-rw-r--r--examples/mainserver/tftp/debian-edu/install-de9.cfg13
-rw-r--r--examples/mainserver/tftp/debian-edu/localboot.cfg5
-rw-r--r--examples/mainserver/tftp/debian-edu/memtest.cfg8
l---------examples/mainserver/tftp/debian-edu/memtest86+.bin1
l---------examples/mainserver/tftp/debian-edu/memtest86.bin1
l---------examples/mainserver/tftp/debian-installer/amd64.stretch1
l---------examples/mainserver/tftp/debian-installer/i386.stretch1
l---------examples/mainserver/tftp/pxelinux.01
l---------examples/mainserver/tftp/pxelinux.cfg/default1
l---------examples/mainserver/tftp/syslinux1
160 files changed, 621 insertions, 395 deletions
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..2990787
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@contentserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..25889ec
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@contentserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..944ebe5
--- /dev/null
+++ b/examples/backup/dirvish/contentserver.intern/contentserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@contentserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..7e698c4
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@disklserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..0704a33
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@disklserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..1b5b8a4
--- /dev/null
+++ b/examples/backup/dirvish/disklserver.intern/disklserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@disklserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf
new file mode 100644
index 0000000..5e4cfbf
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_boot/dirvish/default.conf
@@ -0,0 +1,8 @@
+client: root@faiserver.intern
+tree: /boot
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/** \ No newline at end of file
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf
new file mode 100644
index 0000000..2c838d7
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_rootfs/dirvish/default.conf
@@ -0,0 +1,18 @@
+client: root@faiserver.intern
+tree: /
+devices: 1
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ tmp/**
+ proc/
+ sys/
+ etc/mtab
+ var/lib/nfs/*tab
+ var/cache/apt/archives/*.deb
+ var/cache/man/**
+ var/tmp/**
+ usr/src/**/*.o
+ usr/local/src/**/*.o
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf
new file mode 100644
index 0000000..92dc1d7
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_srv/dirvish/default.conf
@@ -0,0 +1,9 @@
+client: root@faiserver.intern
+tree: /srv
+devices: 1
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ _NO-BACKUP_/**
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf
new file mode 100644
index 0000000..8a4de50
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_usr/dirvish/default.conf
@@ -0,0 +1,10 @@
+client: root@faiserver.intern
+tree: /usr
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ src/**/*.o
+ local/src/**/*.o
+
diff --git a/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf b/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf
new file mode 100644
index 0000000..080920e
--- /dev/null
+++ b/examples/backup/dirvish/faiserver.intern/faiserver.intern_var/dirvish/default.conf
@@ -0,0 +1,11 @@
+client: root@faiserver.intern
+tree: /var
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
+exclude:
+ lib/nfs/*tab
+ cache/apt/archives/*.deb
+ cache/man/**
+ tmp/**
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
index 49e925d..226a8df 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_boot/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /boot
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
index 712ea02..ada6338 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_rootfs/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /
devices: 1
xdev: 1
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
index b50a6bb..477db82 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group0/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/group0
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
index f17f3d8..8fb5706 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+group1/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/group1
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
index f131194..b69467c 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home0/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/home0
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
index e63c1fc..4a63100 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+home1/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/home1
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
index 6fc6531..1a430b9 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_skole+tjener+transfer/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /skole/tjener/transfer
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
index 57d2775..974a780 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_usr/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /usr
xdev: 1
index: gzip
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf
new file mode 100644
index 0000000..b9fc910
--- /dev/null
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_var+log/dirvish/default.conf
@@ -0,0 +1,6 @@
+client: root@tjener.backbone
+tree: /var/log
+xdev: 1
+index: gzip
+log: gzip
+image-default: %Y%m%d
diff --git a/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf b/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
index 9e5a9b5..abb8e3e 100644
--- a/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
+++ b/examples/backup/dirvish/tjener.intern/tjener.intern_var/dirvish/default.conf
@@ -1,4 +1,4 @@
-client: root@tjener.intern
+client: root@tjener.backbone
tree: /var
xdev: 1
index: gzip
diff --git a/examples/backup/master.conf.dirvish b/examples/backup/master.conf.dirvish
index d860108..7e4443b 100644
--- a/examples/backup/master.conf.dirvish
+++ b/examples/backup/master.conf.dirvish
@@ -6,12 +6,13 @@
bank:
/srv/dirvish/virt-man-01.backbone
- /srv/dirvish/virt-man-02.backbone
- /srv/dirvish/virt-man-03.backbone
+# /srv/dirvish/virt-man-02.backbone
+# /srv/dirvish/virt-man-03.backbone
/srv/dirvish/tjener.intern
/srv/dirvish/disklserver.intern
- /srv/dirvish/ltspserver00.intern
- /srv/dirvish/contentserver.intern
+ /srv/dirvish/faiserver.intern
+# /srv/dirvish/ltspserver00.intern
+# /srv/dirvish/contentserver.intern
image-perm: 700
meta-perm: 600
@@ -29,26 +30,38 @@ exclude:
_NO-BACKUP_
Runall:
virt-man-01.backbone_rootfs 22:00
- virt-man-02.backbone_rootfs 22:00
- virt-man-03.backbone_rootfs 22:00
+# virt-man-02.backbone_rootfs 22:00
+# virt-man-03.backbone_rootfs 22:00
tjener.intern_rootfs 22:00
tjener.intern_boot 22:00
tjener.intern_usr 22:00
tjener.intern_var 22:00
+ tjener.intern_var+log 22:00
tjener.intern_skole+tjener+home0 22:00
tjener.intern_skole+tjener+home1 22:00
tjener.intern_skole+tjener+group0 22:00
tjener.intern_skole+tjener+group1 22:00
tjener.intern_skole+tjener+transfer 22:00
disklserver.intern_rootfs 22:00
+ disklserver.intern_boot 22:00
+ disklserver.intern_usr 22:00
+ disklserver.intern_var 22:00
disklserver.intern_srv 22:00
- ltspserver00.intern_rootfs 22:00
- ltspserver00.intern_boot 22:00
- ltspserver00.intern_usr 22:00
- ltspserver00.intern_var 22:00
- ltspserver00.intern_opt 22:00
- contentserver.intern_rootfs 22:00
- contentserver.intern_srv 22:00
+ faiserver.intern_rootfs 22:00
+ faiserver.intern_boot 22:00
+ faiserver.intern_usr 22:00
+ faiserver.intern_var 22:00
+ faiserver.intern_srv 22:00
+# ltspserver00.intern_rootfs 22:00
+# ltspserver00.intern_boot 22:00
+# ltspserver00.intern_usr 22:00
+# ltspserver00.intern_var 22:00
+# ltspserver00.intern_opt 22:00
+# contentserver.intern_rootfs 22:00
+# contentserver.intern_boot 22:00
+# contentserver.intern_usr 22:00
+# contentserver.intern_var 22:00
+# contentserver.intern_srv 22:00
expire-default: +15 days
expire-rule:
diff --git a/examples/disklserver/README.tftp b/examples/disklserver/README.tftp
deleted file mode 100644
index 30b2265..0000000
--- a/examples/disklserver/README.tftp
+++ /dev/null
@@ -1,10 +0,0 @@
-This folder contains a PXE boot environments that provides the
-boot menu for diskless workstations as provided by a standalone
-Debian Edu based diskless chroot image server (aka disklserver).
-
-Installation steps:
-
- 1. Untar these files to disklserver:/srv/tftp
-
- $ tar xvz -C /srv -f disklserver-tftp.tar.gz
-
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg
new file mode 100644
index 0000000..e3c6580
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_background.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="361.04999"
+ height="271.92001"
+ viewBox="0 0 361.244 270.933"
+ id="svg2"
+ xml:space="preserve"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="bg-anim.svg"><metadata
+ id="metadata30"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1598"
+ inkscape:window-height="879"
+ id="namedview28"
+ showgrid="false"
+ inkscape:zoom="2"
+ inkscape:cx="132.20018"
+ inkscape:cy="132.38275"
+ inkscape:window-x="0"
+ inkscape:window-y="19"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 135.96001 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="361.04999 : 135.96001 : 1"
+ inkscape:persp3d-origin="180.52499 : 90.640004 : 1"
+ id="perspective32" /><linearGradient
+ id="linearGradient2802"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2804" /><stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop2806" /></linearGradient><linearGradient
+ id="linearGradient2852"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2854" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop2856" /></linearGradient><linearGradient
+ id="linearGradient2844"><stop
+ style="stop-color:#deeaed;stop-opacity:1"
+ offset="0"
+ id="stop2846" /><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="1"
+ id="stop2848" /></linearGradient><linearGradient
+ id="linearGradient1948"><stop
+ style="stop-color:#b2856b;stop-opacity:0.4235808;"
+ offset="0"
+ id="stop1950" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop1952" /></linearGradient>
+ <style
+ type="text/css"
+ id="style6" />
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="id0"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop9" />
+ <stop
+ style="stop-color:#6e707f;stop-opacity:1"
+ offset="1"
+ id="stop11" />
+ </linearGradient>
+
+
+
+
+
+
+
+
+
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="linearGradient1942"
+ xlink:href="#id0"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="107.24445"
+ y1="268.11078"
+ x2="107.64762"
+ y2="207.717"
+ id="linearGradient1954"
+ xlink:href="#linearGradient1948"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="278.59366"
+ y1="-49.590809"
+ x2="133.85397"
+ y2="120.54888"
+ id="linearGradient2808"
+ xlink:href="#linearGradient2802"
+ gradientUnits="userSpaceOnUse" /></defs>
+
+
+ <rect
+ style="fill:#800000;fill-opacity:1"
+ id="hintergrund"
+ height="270.92899"
+ width="361.23801"
+ y="0.00456294"
+ x="-361.23801"
+ class="fil0"
+ transform="scale(-1,1)">
+ <animateColor
+ attributeName="fill"
+ attributeType="XML"
+ from="#000000"
+ to="#246ed8"
+ begin="0s"
+ dur="4s"
+ fill="freeze"
+ id="animateColor24" />
+ </rect>
+
+
+ <path
+ d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z "
+ style="fill:url(#linearGradient2808);fill-opacity:1"
+ id="path19" />
+
+
+</svg> \ No newline at end of file
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start
new file mode 100755
index 0000000..6165817
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient-minidesktop_start
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# make sure pulseaudio can be reached via TCP from the X2Go Server side...
+/usr/bin/pactl 'load-module' 'module-native-protocol-tcp' 'auth-ip-acl=127.0.0.1;::1'
+
+/usr/lib/x2go/x2goclient --no-menu \
+ --maximize \
+ --link=lan \
+ --kbd-type=auto \
+ --set-kbd=1 \
+ --geometry=fullscreen \
+ --read-exports-from=~/export \
+ --no-session-edit \
+ --close-disconnect \
+ --session=X2Go.Example \
+ --add-to-known-hosts
+
+#/usr/libx/x2go/x2goclient --no-menu \
+# --maximize \
+# --link=lan \
+# --kbd-type=auto \
+# --set-kbd=1 \
+# --geometry=fullscreen \
+# --read-exports-from=~/export \
+# --broker-url=https://x2gobroker.intern:8080/plain/zeroconf \
+# --broker-autologoff \
+# --add-to-known-hosts
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init
new file mode 100755
index 0000000..0e56c95
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Copyright (C) 2007-2019 X2Go Project - https://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2011-2019 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+set -e
+
+run-parts /etc/x2go/x2gothinclient_init.d/
+
+exit 0
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home
new file mode 100755
index 0000000..ebf08b1
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/005_x2gothinclient-wipe-home
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+ if [ -d ~x2gothinclient ]; then
+ find ~x2gothinclient -mindepth 1 -type f | egrep -v "(\.Xauthority|.dmrc)" | while read file; do
+ rm -vf "$file"
+ done
+ find ~x2gothinclient -mindepth 1 -type d -delete
+ fi
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home
new file mode 100755
index 0000000..2417a24
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+ mkdir -p ~x2gothinclient
+ mkdir -p ~x2gothinclient/.x2goclient
+ if [ -e /etc/x2go/x2gothinclient_sessions ]; then
+ cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions
+ fi
+ if [ -e /etc/x2go/freerdp/known_hosts ]; then
+ mkdir -p ~x2gothinclient/.freerdp
+ cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts
+ fi
+ if [ -e /etc/x2go/freerdp/known_hosts2 ]; then
+ mkdir -p ~x2gothinclient/.config/freerdp
+ cp /etc/x2go/freerdp/known_hosts2 ~x2gothinclient/.config/freerdp/known_hosts2
+ fi
+ if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then
+ mkdir -p ~x2gothinclient/Desktop
+ cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/
+ chmod 0700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop
+ fi
+ mkdir -p ~x2gothinclient/.kde
+ mkdir -p ~x2gothinclient/.kde/socket-`hostname`
+ mkdir -p ~x2gothinclient/mounts
+ mkdir -p ~x2gothinclient/.gnupg
+ echo -e "pinentry-program /usr/bin/pinentry-x2go\nenable-ssh-support">~x2gothinclient/.gnupg/gpg-agent.conf
+ mkdir -p ~x2gothinclient/export
+ mkdir -p ~x2gothinclient/logins
+ mkdir -p ~x2gothinclient/.ssh
+ mkdir -p ~x2gothinclient/.x2go
+ chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf
+ chmod go-rwx ~x2gothinclient -Rf
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop
new file mode 100755
index 0000000..023e210
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_init.d/950_x2gothinclient-minidesktop
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org
+# Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if [ -d "/lib/live/config" ] || [ -e "/usr/share/doc/x2gothinclient-minidesktop" ]; then
+ . /etc/X11/Xsession
+fi
diff --git a/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions
new file mode 100644
index 0000000..750a5c4
--- /dev/null
+++ b/examples/disklserver/settings_x2go-minidesktop+amd64+bullseye/x2gothinclient_sessions
@@ -0,0 +1,66 @@
+[20100623163928371]
+defsndport = false
+useiconv = false
+iconvfrom = ISO8859-15
+height = 768
+export =
+speed = 4
+fullscreen = true
+width = 1024
+quality = 9
+xdmcpserver = localhost
+soundtunnel = 1
+rdpoptions =
+soundsystem = pulse
+print = 1
+type = auto
+sndport = 4713
+usekbd = true
+fstunnel = true
+applications = OFFICE, WWWBROWSER, MAILCLIENT, TERMINAL
+host = 192.168.0.254
+link = ADSL
+user = <USER>
+key =
+startsoundsystem = false
+icon =
+sound = true
+rootless = false
+name = X2Go.EXAMPLE
+iconvto = UTF-8
+rdpserver =
+useexports = true
+command = MATE
+dpi = 96
+sshport = 22
+setdpi = false
+pack = 16m-jpeg
+
+[20120607130604224872]
+height = 768
+export =
+fullscreen = true
+useexports = 1
+width = 1024
+speed = 4
+rdpoptions =
+soundsystem = pulse
+print = true
+type = auto
+sndport = 4713
+usekbd = true
+host = rdpserver.your-intranet.local
+multidisp=false
+sound=false
+rootless=false
+name=DirectRDP.Example
+command=RDP
+dpi=96
+published=false
+setdpi=false
+user=<USER>
+maxdim=false
+rdpclient=xfreerdpnew
+directrdpsettings=/d:YOUR-DOMAIN /sound:sys:pulse /cert-ignore
+rdpport=3389
+directrdp=true
diff --git a/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
deleted file mode 100644
index 87bc738..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# German
-LABEL localboot-generic
- MENU LABEL Von Festplatte ^starten
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
deleted file mode 100644
index dc38819..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# German
-LABEL localboot-mswin
- MENU LABEL MS ^Windows starten
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 100644
index 359c59c..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL ltsp-diskless-jessie
- MENU LABEL ^Diskless Workstation (Debian Edu 8.0) [NFS]
- MENU DEFAULT
- KERNEL ltsp/i386+jessie/vmlinuz
- APPEND initrd=ltsp/i386+jessie/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/i386+jessie,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet ipappend 2
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 100644
index 3a2d71a..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL ltsp-diskless-stretch
- MENU LABEL ^Diskless Workstation (Debian Edu 9.0) [NFS]
-# MENU DEFAULT
- KERNEL ltsp/amd64+stretch/vmlinuz
- APPEND initrd=ltsp/amd64+stretch/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/amd64+stretch,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet splash ipappend
-
-LABEL ltsp-diskless-stretch-NBD
- MENU LABEL ^Diskless Workstation (Debian Edu 9.0) [NBD]
-# MENU DEFAULT
- KERNEL ltsp/amd64+stretch/vmlinuz
- APPEND append ro initrd=ltsp/amd64+stretch/initrd.img init=/sbin/init-ltsp quiet root=/dev/nbd0 nbdroot=/opt/ltsp/amd64_stretch splash
- IPAPPEND 3
-
diff --git a/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg b/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
deleted file mode 100644
index 8bf162a..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
diff --git a/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
deleted file mode 100644
index ed5660d..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL mint-workstation
- MENU LABEL Linux Mint
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
deleted file mode 100644
index 798b022..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL skolelinux-workstation
- MENU LABEL Debian Edu/Skolelinux Arbeitsstation
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
deleted file mode 100644
index 11dc813..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL ubuntu-workstation
- MENU LABEL Ubuntu GNU/Linux
- localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
deleted file mode 100644
index 18ccd4c..0000000
--- a/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-LABEL x2go-tce
- MENU LABEL ^X2Go Thin Client (i486)
- KERNEL x2go/i386/vmlinuz
- APPEND initrd=x2go/i386/initrd.img nfsroot=/opt/x2gothinclient/chroot,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet
diff --git a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img
deleted file mode 120000
index cd8993f..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64+stretch/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz
deleted file mode 120000
index f063f8e..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64+stretch/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img
deleted file mode 120000
index 1e57586..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386+jessie/boot/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz
deleted file mode 120000
index 46cc704..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386+jessie/boot/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux b/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux b/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/initrd.img b/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
deleted file mode 120000
index 4f0f0b5..0000000
--- a/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/opt/x2gothinclient/chroot/boot/initrd.img \ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz b/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
deleted file mode 120000
index 74fb488..0000000
--- a/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/opt/x2gothinclient/chroot/boot/vmlinuz \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 88a684c..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-include debian-edu/localboot-generic.cfg
-MENU SEPARATOR
-include debian-edu/ltsp-diskless-stretch.cfg
-include debian-edu/ltsp-diskless-jessie.cfg
-#include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot-generic
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
deleted file mode 120000
index 08a2e34..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/localboot-generic.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 120000
index 209d4f9..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-jessie.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 120000
index 7cf19dd..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-stretch.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg
deleted file mode 100644
index 7da6b48..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
-
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp b/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index bc7b885..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-include debian-edu/ltsp-diskless-stretch.cfg
-include debian-edu/ltsp-diskless-jessie.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout ltsp-diskless-jessie
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
deleted file mode 120000
index 209d4f9..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-jessie.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg
deleted file mode 120000
index 7cf19dd..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-stretch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ltsp-diskless-stretch.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/ltsp b/examples/disklserver/tftp/diskless+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/diskless+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/diskless+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/diskless+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/syslinux b/examples/disklserver/tftp/diskless+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/diskless+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 97b819a..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/mint-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout mint-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
deleted file mode 120000
index aefcc8b..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/mint-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/ltsp b/examples/disklserver/tftp/mint+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/mint+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.0 b/examples/disklserver/tftp/mint+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/mint+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/syslinux b/examples/disklserver/tftp/mint+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/mint+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 4f887d3..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/skolelinux-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout skolelinux-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
deleted file mode 120000
index e018427..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/skolelinux-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/ltsp b/examples/disklserver/tftp/skolelinux+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/syslinux b/examples/disklserver/tftp/skolelinux+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index a88e510..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/ubuntu-workstation.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout ubuntu-workstation \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
deleted file mode 120000
index 993f00a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/ubuntu-workstation.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/ltsp b/examples/disklserver/tftp/ubuntu+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/syslinux b/examples/disklserver/tftp/ubuntu+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
deleted file mode 100644
index 30f1cef..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-include debian-edu/localboot-mswin.cfg
-MENU SEPARATOR
-#include debian-edu/x2go-tce.cfg
-#MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot-mswin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
deleted file mode 120000
index ad6b28d..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/localboot-mswin.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/ltsp b/examples/disklserver/tftp/windows+x2go/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/windows+x2go/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.0 b/examples/disklserver/tftp/windows+x2go/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/windows+x2go/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/windows+x2go/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/syslinux b/examples/disklserver/tftp/windows+x2go/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/windows+x2go/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
deleted file mode 100644
index 4013474..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 30
-ontimeout x2go-tce
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
deleted file mode 120000
index a258c1d..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
deleted file mode 120000
index 6f7e32a..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/ltsp b/examples/disklserver/tftp/x2go-tce/ltsp
deleted file mode 120000
index 7733dbc..0000000
--- a/examples/disklserver/tftp/x2go-tce/ltsp
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/ltsp \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.0 b/examples/disklserver/tftp/x2go-tce/pxelinux.0
deleted file mode 120000
index 42fc1f9..0000000
--- a/examples/disklserver/tftp/x2go-tce/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/pxelinux/stretch/pxelinux.0 \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default b/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/disklserver/tftp/x2go-tce/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/syslinux b/examples/disklserver/tftp/x2go-tce/syslinux
deleted file mode 120000
index 5b2e2d2..0000000
--- a/examples/disklserver/tftp/x2go-tce/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/syslinux/stretch/syslinux \ No newline at end of file
diff --git a/examples/disklserver/x2gothinclient-settings.conf b/examples/disklserver/x2gothinclient-settings.conf
new file mode 100644
index 0000000..42115dd
--- /dev/null
+++ b/examples/disklserver/x2gothinclient-settings.conf
@@ -0,0 +1,61 @@
+# Copyright (C) 2010-2021 by X2Go project, http://wiki.x2go.org
+# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+# X2Go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# X2Go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# select the TCE flavour (classical: "displaymanager", minimal MATE desktop shell: "minidesktop")
+TC_FLAVOUR="minidesktop"
+
+# Distro codename to use...
+TC_DISTRO_CODENAME="bullseye"
+
+# Architecture of the chroot...
+TC_DISTRO_ARCH="amd64"
+
+# path to X2Go thin client chroot
+TC_CHROOT="/srv/ltsp/x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}"
+
+# path to the X2Go thin client configuration
+TC_CONFIG="/etc/ltsp/settings_x2go-${TC_FLAVOUR}+${TC_DISTRO_ARCH}+${TC_DISTRO_CODENAME}"
+
+# shell to use when maintaining X2Go thin client chroot manually
+TC_SHELL="bash"
+
+# Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed)
+#TC_HTTP_PROXY="http://webcache.intern:3128"
+#TC_HTTPS_PROXY="http://webcache.intern:3128"
+#TC_FTP_PROXY="http://webcache.intern:3128"
+TC_HTTP_PROXY="http://faiserver:8000"
+TC_HTTPS_PROXY="http://faiserver:8000"
+TC_FTP_PROXY="http://faiserver:8000"
+
+echo "X2Go Thin Client Environment:"
+echo "============================="
+echo "The X2Go Thin Client Environment is using the following"
+echo "settings:"
+echo
+echo "TC_FLAVOUR=$TC_FLAVOUR"
+echo "TC_DISTRO_CODENAME=$TC_DISTRO_CODENAME"
+echo "TC_DISTRO_ARCH=$TC_DISTRO_ARCH"
+echo "TC_CHROOT=$TC_CHROOT"
+echo "TC_CONFIG=$TC_CONFIG"
+echo "TC_SHELL=$TC_SHELL"
+echo "TC_HTTP_PROXY=$TC_HTTP_PROXY"
+echo "TC_HTTPS_PROXY=$TC_HTTPS_PROXY"
+echo "TC_FTP_PROXY=$TC_FTP_PROXY"
+echo
diff --git a/examples/displayserver/README.tftp b/examples/displayserver/README.tftp
deleted file mode 100644
index 22221b3..0000000
--- a/examples/displayserver/README.tftp
+++ /dev/null
@@ -1,10 +0,0 @@
-This folder contains a PXE boot environment that provides the
-boot menu for display systems as provided by a standalone
-ITZkS Substitute Teacher Schedule Display Server (aka displayserver).
-
-Installation steps:
-
- 1. Untar these files to displayserver:/srv/tftp
-
- $ tar xvz -C /srv -f displayserver-tftp.tar.gz
-
diff --git a/examples/displayserver/tftp/_common_/debian-edu/display.cfg b/examples/displayserver/tftp/_common_/debian-edu/display.cfg
deleted file mode 100644
index 01af6ba..0000000
--- a/examples/displayserver/tftp/_common_/debian-edu/display.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL vplan
- MENU LABEL ^Vertretungsplan / Info-Terminal
- MENU DEFAULT
- KERNEL display/amd64/vmlinuz
- APPEND initrd=ltsp/amd64.jessie/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/amd64.jessie,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet ipappend 2
diff --git a/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg b/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg
deleted file mode 100644
index 8bf162a..0000000
--- a/examples/displayserver/tftp/_common_/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
diff --git a/examples/displayserver/tftp/_common_/display/amd64/initrd.img b/examples/displayserver/tftp/_common_/display/amd64/initrd.img
deleted file mode 120000
index b19c163..0000000
--- a/examples/displayserver/tftp/_common_/display/amd64/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64.jessie/initrd.img \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/display/amd64/vmlinuz b/examples/displayserver/tftp/_common_/display/amd64/vmlinuz
deleted file mode 120000
index 49f9a5f..0000000
--- a/examples/displayserver/tftp/_common_/display/amd64/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/amd64.jessie/vmlinuz \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0 b/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/displayserver/tftp/_common_/pxelinux/jessie/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux b/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/displayserver/tftp/_common_/syslinux/jessie/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/debian-edu-splash.png b/examples/displayserver/tftp/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/displayserver/tftp/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/default-menu.cfg b/examples/displayserver/tftp/debian-edu/default-menu.cfg
deleted file mode 100644
index 4697e25..0000000
--- a/examples/displayserver/tftp/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-include debian-edu/display.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default syslinux/vesamenu.c32
-prompt 0
-timeout 30
diff --git a/examples/displayserver/tftp/debian-edu/display.cfg b/examples/displayserver/tftp/debian-edu/display.cfg
deleted file mode 120000
index 5d11f72..0000000
--- a/examples/displayserver/tftp/debian-edu/display.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/debian-edu/display.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest.cfg b/examples/displayserver/tftp/debian-edu/memtest.cfg
deleted file mode 120000
index 953ea54..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common_/debian-edu/memtest.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest86+.bin b/examples/displayserver/tftp/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/displayserver/tftp/debian-edu/memtest86.bin b/examples/displayserver/tftp/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/displayserver/tftp/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/displayserver/tftp/display b/examples/displayserver/tftp/display
deleted file mode 120000
index e94a655..0000000
--- a/examples/displayserver/tftp/display
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/display \ No newline at end of file
diff --git a/examples/displayserver/tftp/pxelinux.0 b/examples/displayserver/tftp/pxelinux.0
deleted file mode 120000
index d23a196..0000000
--- a/examples/displayserver/tftp/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/pxelinux/jessie/pxelinux.0 \ No newline at end of file
diff --git a/examples/displayserver/tftp/pxelinux.cfg/default b/examples/displayserver/tftp/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/displayserver/tftp/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/displayserver/tftp/syslinux b/examples/displayserver/tftp/syslinux
deleted file mode 120000
index f6725ad..0000000
--- a/examples/displayserver/tftp/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-./_common_/syslinux/jessie/syslinux \ No newline at end of file
diff --git a/examples/mainserver/README.tftp b/examples/mainserver/README.tftp
deleted file mode 100644
index dbfe561..0000000
--- a/examples/mainserver/README.tftp
+++ /dev/null
@@ -1,17 +0,0 @@
-This folder contains a PXE Bootenvironment that provides the
-Debian Edu installer (in German) on the Debian Edu main server.
-
-Installation steps:
-
- 1. Untar these files to tjener:/srv/tftp
-
- $ tar xvz -C /srv -f mainserver-tftp.tar.gz
-
- 2. Preserve Debian Edu's original of /var/lib/tftpboot
-
- $ mv /var/lib/tftpboot /var/lib/tftpboot.orig
-
- 3. Symlink /var/lib/tftpboot -> /srv/tftp
-
- $ ln -s /srv/tftp /var/lib/tftpboot
-
diff --git a/examples/mainserver/tftp/debian-edu/debian-edu-splash.png b/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
deleted file mode 120000
index 246e4dc..0000000
--- a/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/desktop-base/active-theme/grub/grub-4x3.png \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/default-menu.cfg b/examples/mainserver/tftp/debian-edu/default-menu.cfg
deleted file mode 100644
index ebcdb9e..0000000
--- a/examples/mainserver/tftp/debian-edu/default-menu.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-include debian-edu/localboot.cfg
-MENU SEPARATOR
-include debian-edu/install-de9.cfg
-MENU SEPARATOR
-include debian-edu/memtest.cfg
-
-menu hshift 13
-menu width 72
-menu background debian-edu/debian-edu-splash.png
-menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
-default syslinux/vesamenu.c32
-prompt 0
-timeout 100
-ontimeout localboot \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/install-de8.cfg b/examples/mainserver/tftp/debian-edu/install-de8.cfg
deleted file mode 100644
index 706344e..0000000
--- a/examples/mainserver/tftp/debian-edu/install-de8.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL neteduboot-amd64
- MENU LABEL Installiere Debian Edu 8.0 (MATE/^amd64)
- kernel debian-installer/amd64.jessie/linux
- append initrd=debian-installer/amd64.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
-
-LABEL neteduboot-i386
- MENU LABEL Installiere Debian Edu 8.0 (MATE/^i386)
- kernel debian-installer/i386.jessie/linux
- append initrd=debian-installer/i386.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
diff --git a/examples/mainserver/tftp/debian-edu/install-de9.cfg b/examples/mainserver/tftp/debian-edu/install-de9.cfg
deleted file mode 100644
index 67c5289..0000000
--- a/examples/mainserver/tftp/debian-edu/install-de9.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL neteduboot-amd64
- MENU LABEL Installiere Debian Edu 9.0 (MATE/^amd64)
- kernel debian-installer/amd64.stretch/linux
- append initrd=debian-installer/amd64.stretch/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
-
-LABEL neteduboot-i386
- MENU LABEL Installiere Debian Edu 9.0 (MATE/^i386)
- kernel debian-installer/i386.stretch/linux
- append initrd=debian-installer/i386.stretch/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet
- ipappend 2
-include menupassword.cfg
diff --git a/examples/mainserver/tftp/debian-edu/localboot.cfg b/examples/mainserver/tftp/debian-edu/localboot.cfg
deleted file mode 100644
index bf74f87..0000000
--- a/examples/mainserver/tftp/debian-edu/localboot.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL localboot
- MENU LABEL Von ^Festplatte starten
- MENU DEFAULT
- localboot 0
-
diff --git a/examples/mainserver/tftp/debian-edu/memtest.cfg b/examples/mainserver/tftp/debian-edu/memtest.cfg
deleted file mode 100644
index c8e0df2..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-LABEL memtest86
- MENU LABEL Speichertest (memtest86)
- kernel debian-edu/memtest86.bin
-
-LABEL memtest86+
- MENU LABEL Speichertest (memtest86+)
- kernel debian-edu/memtest86+.bin
-
diff --git a/examples/mainserver/tftp/debian-edu/memtest86+.bin b/examples/mainserver/tftp/debian-edu/memtest86+.bin
deleted file mode 120000
index 1b74cce..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86+.bin \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-edu/memtest86.bin b/examples/mainserver/tftp/debian-edu/memtest86.bin
deleted file mode 120000
index 2596a63..0000000
--- a/examples/mainserver/tftp/debian-edu/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/boot/memtest86.bin \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-installer/amd64.stretch b/examples/mainserver/tftp/debian-installer/amd64.stretch
deleted file mode 120000
index accc0dc..0000000
--- a/examples/mainserver/tftp/debian-installer/amd64.stretch
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/debian-installer/images/9/amd64/text/debian-installer/amd64 \ No newline at end of file
diff --git a/examples/mainserver/tftp/debian-installer/i386.stretch b/examples/mainserver/tftp/debian-installer/i386.stretch
deleted file mode 120000
index 43ce00f..0000000
--- a/examples/mainserver/tftp/debian-installer/i386.stretch
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/debian-installer/images/9/i386/text/debian-installer/i386 \ No newline at end of file
diff --git a/examples/mainserver/tftp/pxelinux.0 b/examples/mainserver/tftp/pxelinux.0
deleted file mode 120000
index f723d02..0000000
--- a/examples/mainserver/tftp/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file
diff --git a/examples/mainserver/tftp/pxelinux.cfg/default b/examples/mainserver/tftp/pxelinux.cfg/default
deleted file mode 120000
index ec0c12a..0000000
--- a/examples/mainserver/tftp/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-../debian-edu/default-menu.cfg \ No newline at end of file
diff --git a/examples/mainserver/tftp/syslinux b/examples/mainserver/tftp/syslinux
deleted file mode 120000
index 7bea767..0000000
--- a/examples/mainserver/tftp/syslinux
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/modules/bios \ No newline at end of file