The branch, tmpfs has been updated via 33d3184a8a277cb78a4ec1aed125dc18c0879479 (commit) from 1080b9ca2f7faf521482588a661606a72eeecba9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 33d3184a8a277cb78a4ec1aed125dc18c0879479 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 14 19:16:53 2011 +0200 Move PXE tftpboot examples to x2gothinclient/share/tftpboot, improval of syslinux boot screen. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + debian/x2gothinclientmanagement.examples | 1 - debian/x2gothinclientmanagement.install | 1 + .../examples/tftpboot/default.cfg | 17 ------------- x2gothinclientmanagement/examples/tftpboot/vmlinuz | 1 - .../examples/tftpboot/x2go-splash.png | Bin 6750 -> 0 bytes .../examples/tftpboot/x2go-tce.cfg | 6 ---- .../share/tftpboot/default.cfg | 26 ++++++++++++++++++++ .../share/tftpboot/initrd.img.486 | 1 + .../initrd.img => share/tftpboot/initrd.img.686} | 0 .../{examples => share}/tftpboot/local-boot.cfg | 0 .../share/tftpboot/memtest.cfg | 3 ++ .../share/tftpboot/memtest86+.bin | 1 + .../{examples => share}/tftpboot/pxelinux.0 | 0 .../share/tftpboot/pxelinux.cfg/default | 1 + .../{examples => share}/tftpboot/vesamenu.c32 | 0 .../share/tftpboot/vmlinuz.486 | 1 + .../share/tftpboot/vmlinuz.686 | 1 + .../share/tftpboot/x2go-splash.png | Bin 0 -> 4314 bytes .../share/tftpboot/x2go-tce.cfg | 8 ++++++ 20 files changed, 45 insertions(+), 25 deletions(-) delete mode 100644 debian/x2gothinclientmanagement.examples delete mode 100644 x2gothinclientmanagement/examples/tftpboot/default.cfg delete mode 120000 x2gothinclientmanagement/examples/tftpboot/vmlinuz delete mode 100644 x2gothinclientmanagement/examples/tftpboot/x2go-splash.png delete mode 100644 x2gothinclientmanagement/examples/tftpboot/x2go-tce.cfg create mode 100644 x2gothinclientmanagement/share/tftpboot/default.cfg create mode 120000 x2gothinclientmanagement/share/tftpboot/initrd.img.486 rename x2gothinclientmanagement/{examples/tftpboot/initrd.img => share/tftpboot/initrd.img.686} (100%) rename x2gothinclientmanagement/{examples => share}/tftpboot/local-boot.cfg (100%) create mode 100644 x2gothinclientmanagement/share/tftpboot/memtest.cfg create mode 120000 x2gothinclientmanagement/share/tftpboot/memtest86+.bin rename x2gothinclientmanagement/{examples => share}/tftpboot/pxelinux.0 (100%) create mode 120000 x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default rename x2gothinclientmanagement/{examples => share}/tftpboot/vesamenu.c32 (100%) create mode 120000 x2gothinclientmanagement/share/tftpboot/vmlinuz.486 create mode 120000 x2gothinclientmanagement/share/tftpboot/vmlinuz.686 create mode 100644 x2gothinclientmanagement/share/tftpboot/x2go-splash.png create mode 100644 x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7f1786b..5eede21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add acpid to x2gothinclient's Recommends: section. * Install 486 and 686 kernels in TCE chroot. * Add memtest86+ to x2gothinclient's Recommends: section. + * Move PXE tftpboot examples to x2gothinclient/share/tftpboot. + * Improval of syslinux boot screen. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/debian/x2gothinclientmanagement.examples b/debian/x2gothinclientmanagement.examples deleted file mode 100644 index b4c62b0..0000000 --- a/debian/x2gothinclientmanagement.examples +++ /dev/null @@ -1 +0,0 @@ -x2gothinclientmanagement/examples/* diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index 517f703..584c49b 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -1,3 +1,4 @@ x2gothinclientmanagement/bin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/x2gothinclient_* usr/share/x2go/tce/ +x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ diff --git a/x2gothinclientmanagement/examples/tftpboot/default.cfg b/x2gothinclientmanagement/examples/tftpboot/default.cfg deleted file mode 100644 index bd94c2a..0000000 --- a/x2gothinclientmanagement/examples/tftpboot/default.cfg +++ /dev/null @@ -1,17 +0,0 @@ -# -# example for a main boot menu of an X2go Thin Client -# - -include local-boot.cfg -MENU SEPARATOR -include x2go-tce.cfg -MENU SEPARATOR -include memtest.cfg - -menu hshift 13 -menu width 49 -menu background x2go-splash.png -default vesamenu.c32 -prompt 0 -timeout 0 - diff --git a/x2gothinclientmanagement/examples/tftpboot/vmlinuz b/x2gothinclientmanagement/examples/tftpboot/vmlinuz deleted file mode 120000 index 8e47565..0000000 --- a/x2gothinclientmanagement/examples/tftpboot/vmlinuz +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/vmlinuz \ No newline at end of file diff --git a/x2gothinclientmanagement/examples/tftpboot/x2go-splash.png b/x2gothinclientmanagement/examples/tftpboot/x2go-splash.png deleted file mode 100644 index 324b81a..0000000 Binary files a/x2gothinclientmanagement/examples/tftpboot/x2go-splash.png and /dev/null differ diff --git a/x2gothinclientmanagement/examples/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/examples/tftpboot/x2go-tce.cfg deleted file mode 100644 index 6a0587b..0000000 --- a/x2gothinclientmanagement/examples/tftpboot/x2go-tce.cfg +++ /dev/null @@ -1,6 +0,0 @@ -LABEL ltsp-thin - MENU LABEL X2go ^Thin Client - KERNEL vmlinuz - APPEND initrd=initrd.img nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet 4 - -# DEFAULT vmlinuz initrd=initrd.img nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet 4 diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg new file mode 100644 index 0000000..5a0d432 --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/default.cfg @@ -0,0 +1,26 @@ +# +# example for a main boot menu of an X2go Thin Client +# + +DEFAULT vesamenu.c32 +PROMPT 0 +MENU BACKGROUND x2go-splash.png +MENU TITLE X2go Thin Client Environment + +include local-boot.cfg +include x2go-tce.cfg +MENU SEPARATOR +include memtest.cfg + +# menu settings +MENU VSHIFT 12 +MENU WIDTH 80 +MENU MARGIN 10 +MENU ROWS 12 +MENU TABMSGROW 13 +MENU CMDLINEROW 14 +MENU ENDROW 12 +MENU TIMEOUTROW 15 +ONTIMEOUT localboot +TIMEOUT 100 + diff --git a/x2gothinclientmanagement/share/tftpboot/initrd.img.486 b/x2gothinclientmanagement/share/tftpboot/initrd.img.486 new file mode 120000 index 0000000..fc94893 --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/initrd.img.486 @@ -0,0 +1 @@ +/opt/x2gothinclient/chroot/initrd.img.old \ No newline at end of file diff --git a/x2gothinclientmanagement/examples/tftpboot/initrd.img b/x2gothinclientmanagement/share/tftpboot/initrd.img.686 similarity index 100% rename from x2gothinclientmanagement/examples/tftpboot/initrd.img rename to x2gothinclientmanagement/share/tftpboot/initrd.img.686 diff --git a/x2gothinclientmanagement/examples/tftpboot/local-boot.cfg b/x2gothinclientmanagement/share/tftpboot/local-boot.cfg similarity index 100% rename from x2gothinclientmanagement/examples/tftpboot/local-boot.cfg rename to x2gothinclientmanagement/share/tftpboot/local-boot.cfg diff --git a/x2gothinclientmanagement/share/tftpboot/memtest.cfg b/x2gothinclientmanagement/share/tftpboot/memtest.cfg new file mode 100644 index 0000000..c88a3e8 --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/memtest.cfg @@ -0,0 +1,3 @@ +LABEL memtest86plus + MENU LABEL memtest86+ (run memory test) + LINUX memtest86+.bin diff --git a/x2gothinclientmanagement/share/tftpboot/memtest86+.bin b/x2gothinclientmanagement/share/tftpboot/memtest86+.bin new file mode 120000 index 0000000..cba533a --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/memtest86+.bin @@ -0,0 +1 @@ +/opt/x2gothinclient/chroot/boot/memtest86+.bin \ No newline at end of file diff --git a/x2gothinclientmanagement/examples/tftpboot/pxelinux.0 b/x2gothinclientmanagement/share/tftpboot/pxelinux.0 similarity index 100% rename from x2gothinclientmanagement/examples/tftpboot/pxelinux.0 rename to x2gothinclientmanagement/share/tftpboot/pxelinux.0 diff --git a/x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default b/x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default new file mode 120000 index 0000000..cdc626f --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default @@ -0,0 +1 @@ +../default.cfg \ No newline at end of file diff --git a/x2gothinclientmanagement/examples/tftpboot/vesamenu.c32 b/x2gothinclientmanagement/share/tftpboot/vesamenu.c32 similarity index 100% rename from x2gothinclientmanagement/examples/tftpboot/vesamenu.c32 rename to x2gothinclientmanagement/share/tftpboot/vesamenu.c32 diff --git a/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 b/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 new file mode 120000 index 0000000..f7680da --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 @@ -0,0 +1 @@ +/opt/x2gothinclient/chroot/vmlinuz.486 \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 b/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 new file mode 120000 index 0000000..d75d1d6 --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 @@ -0,0 +1 @@ +/opt/x2gothinclient/chroot/vmlinuz.686 \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png new file mode 100644 index 0000000..0886917 Binary files /dev/null and b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png differ diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg new file mode 100644 index 0000000..fce038d --- /dev/null +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -0,0 +1,8 @@ +LABEL x2go-tce-686 + MENU LABEL X2go ^Thin Client + KERNEL vmlinuz.686 + APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet +LABEL x2go-tce-486 + MENU LABEL X2go ^Thin Client (old hardware) + KERNEL vmlinuz.486 + APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2go Thin Client Environment).