diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-07 16:00:36 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-07 16:01:07 +0100 |
commit | a09f2339f0187d023d6654a590d8ba6ce00ffb89 (patch) | |
tree | 6145431651bbd5d3b83276d67e1310ad754aa08e | |
parent | 48bdf9bfc4ab5a949eadd41c48c67a7cbcd72e9d (diff) | |
download | itzks-systems-a09f2339f0187d023d6654a590d8ba6ce00ffb89.tar.gz itzks-systems-a09f2339f0187d023d6654a590d8ba6ce00ffb89.tar.bz2 itzks-systems-a09f2339f0187d023d6654a590d8ba6ce00ffb89.zip |
disklserver tftpd config: Update. Use "<arch>+<dist>" as distro naming pattern rather than "<arch>.<dist>".
31 files changed, 32 insertions, 40 deletions
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg index 0cc9de8..359c59c 100644 --- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg +++ b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg @@ -1,8 +1,5 @@ LABEL ltsp-diskless-jessie - MENU LABEL ^Diskless Workstation (Debian Edu 8.0) + 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 - - - + 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-squeeze.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg deleted file mode 100644 index 8561984..0000000 --- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg +++ /dev/null @@ -1,8 +0,0 @@ -LABEL ltsp-diskless-squeeze - MENU LABEL ^Diskless Workstation (Debian Edu 6.0) - MENU DEFAULT - KERNEL ltsp/i386.squeeze/vmlinuz - APPEND initrd=ltsp/i386.squeeze/initrd.img nfsroot=/opt/ltsp/i386.squeeze,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet - - - diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg index c8f7f5a..3a2d71a 100644 --- a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg +++ b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-stretch.cfg @@ -1,8 +1,13 @@ LABEL ltsp-diskless-stretch - MENU LABEL ^Diskless Workstation (Debian Edu 9.0) + 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 - + 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_/ltsp/amd64+stretch/initrd.img b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img new file mode 120000 index 0000000..cd8993f --- /dev/null +++ b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/initrd.img @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..f063f8e --- /dev/null +++ b/examples/disklserver/tftp/_common_/ltsp/amd64+stretch/vmlinuz @@ -0,0 +1 @@ +/srv/ltsp/amd64+stretch/vmlinuz
\ No newline at end of file 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 ad7e08d..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 b3c9206..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 new file mode 120000 index 0000000..1e57586 --- /dev/null +++ b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/initrd.img @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..46cc704 --- /dev/null +++ b/examples/disklserver/tftp/_common_/ltsp/i386+jessie/vmlinuz @@ -0,0 +1 @@ +/srv/ltsp/i386+jessie/boot/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 6894bac..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 3c6e043..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_/ltsp/i386.squeeze/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/initrd.img deleted file mode 120000 index ce21bae..0000000 --- a/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/initrd.img +++ /dev/null @@ -1 +0,0 @@ -/srv/ltsp/i386.squeeze/boot/initrd.img
\ No newline at end of file diff --git a/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz deleted file mode 120000 index e0521ef..0000000 --- a/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz +++ /dev/null @@ -1 +0,0 @@ -/srv/ltsp/i386.squeeze/boot/vmlinuz
\ No newline at end of file diff --git a/examples/disklserver/tftp/_common_/pxelinux/squeeze/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/squeeze/pxelinux.0 deleted file mode 120000 index 0f93aef..0000000 --- a/examples/disklserver/tftp/_common_/pxelinux/squeeze/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/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 new file mode 120000 index 0000000..f723d02 --- /dev/null +++ b/examples/disklserver/tftp/_common_/pxelinux/stretch/pxelinux.0 @@ -0,0 +1 @@ +/usr/lib/PXELINUX/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux b/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux deleted file mode 120000 index e76fbf5..0000000 --- a/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/
\ No newline at end of file diff --git a/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux b/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux new file mode 120000 index 0000000..7bea767 --- /dev/null +++ b/examples/disklserver/tftp/_common_/syslinux/stretch/syslinux @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios
\ 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 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux +++ b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+x2go/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/diskless+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/diskless+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/diskless+x2go/syslinux b/examples/disklserver/tftp/diskless+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/diskless+x2go/syslinux +++ b/examples/disklserver/tftp/diskless+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.0 b/examples/disklserver/tftp/mint+x2go/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/mint+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/mint+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/mint+x2go/syslinux b/examples/disklserver/tftp/mint+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/mint+x2go/syslinux +++ b/examples/disklserver/tftp/mint+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/skolelinux+x2go/syslinux b/examples/disklserver/tftp/skolelinux+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/skolelinux+x2go/syslinux +++ b/examples/disklserver/tftp/skolelinux+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/ubuntu+x2go/syslinux b/examples/disklserver/tftp/ubuntu+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/ubuntu+x2go/syslinux +++ b/examples/disklserver/tftp/ubuntu+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.0 b/examples/disklserver/tftp/windows+x2go/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/windows+x2go/pxelinux.0 +++ b/examples/disklserver/tftp/windows+x2go/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/windows+x2go/syslinux b/examples/disklserver/tftp/windows+x2go/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/windows+x2go/syslinux +++ b/examples/disklserver/tftp/windows+x2go/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.0 b/examples/disklserver/tftp/x2go-tce/pxelinux.0 index 8ddd87d..42fc1f9 120000 --- a/examples/disklserver/tftp/x2go-tce/pxelinux.0 +++ b/examples/disklserver/tftp/x2go-tce/pxelinux.0 @@ -1 +1 @@ -../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file +../_common_/pxelinux/stretch/pxelinux.0
\ No newline at end of file diff --git a/examples/disklserver/tftp/x2go-tce/syslinux b/examples/disklserver/tftp/x2go-tce/syslinux index 1e76da6..5b2e2d2 120000 --- a/examples/disklserver/tftp/x2go-tce/syslinux +++ b/examples/disklserver/tftp/x2go-tce/syslinux @@ -1 +1 @@ -../_common_/syslinux/jessie/syslinux
\ No newline at end of file +../_common_/syslinux/stretch/syslinux
\ No newline at end of file |