summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSIONS2
-rw-r--r--installer/default_files/atftpd_default3
-rw-r--r--installer/default_files/atftpd_sysconfig24
-rw-r--r--installer/default_files/default37
-rw-r--r--installer/default_files/dhcpd.conf138
-rw-r--r--installer/default_files/hwdata/Cards.local51
-rw-r--r--installer/default_files/hwdata/pcitable.local34
-rw-r--r--installer/default_files/machine-setup.default137
-rwxr-xr-xinstaller/default_files/tftpboot/ethersel.c32bin5796 -> 0 bytes
-rwxr-xr-xinstaller/default_files/tftpboot/mboot.c32bin47404 -> 0 bytes
10 files changed, 1 insertions, 425 deletions
diff --git a/VERSIONS b/VERSIONS
index 8bd01818..ca3c16f9 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,4 +1,4 @@
OPENSLX_VERSION_MAJOR="4"
OPENSLX_VERSION_MINOR="9"
-OPENSLX_VERSION_RELEASE="0"
+OPENSLX_VERSION_RELEASE="1"
OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_SVN_SNAPSHOT:+rev$OPENSLX_VERSION_SVNREV}"
diff --git a/installer/default_files/atftpd_default b/installer/default_files/atftpd_default
deleted file mode 100644
index e36a5a33..00000000
--- a/installer/default_files/atftpd_default
+++ /dev/null
@@ -1,3 +0,0 @@
-USE_INETD=false
-OPTIONS="--daemon --port 69 --retry-timeout 5 --no-multicast --maxthread 100 --verbose=5 @@@tftpbootdir@@@"
-
diff --git a/installer/default_files/atftpd_sysconfig b/installer/default_files/atftpd_sysconfig
deleted file mode 100644
index 39077edd..00000000
--- a/installer/default_files/atftpd_sysconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-## Path: Network/FTP/Atftpd
-## Description: ATFTP Configuration
-## Type: string
-## Default: "--daemon "
-#
-# atftpd options
-#
-ATFTPD_OPTIONS="--daemon "
-
-## Type: yesno
-## Default: no
-#
-# Use inetd instead of daemon
-#
-ATFTPD_USE_INETD="no"
-
-## Type: string
-## Default: "/tftpboot"
-#
-# TFTP directory must be a world readable/writable directory.
-# By default /tftpboot is assumed.
-#
-ATFTPD_DIRECTORY="@@@tftpbootdir@@@"
-
diff --git a/installer/default_files/default b/installer/default_files/default
deleted file mode 100644
index 06c23024..00000000
--- a/installer/default_files/default
+++ /dev/null
@@ -1,37 +0,0 @@
-# ~/pxelinux.cfg/default (main-menu)
-#
-# Description: Boot selection with the new Syslinux/PXElinux by Peter Anwin
-# selection is done by cursor up and down keys
-DEFAULT @@@server@@@::/menu.c32
-
-PROMPT 0
-NOESCAPE 1
-TIMEOUT 600
-#IMPLICIT 1
-#ALLOWOPTIONS 1
-#ONERROR menu
-
-MENU MASTER PASSWD @@@pxe_passwd@@@
-
-MENU TITLE Diskless X-Stations
-
-
-#####
-LABEL Bitte waehlen Sie mit den Pfeil-Tasten aus:
- KERNEL ::/menu.c32
- APPEND @@@server@@@::/pxelinux.cfg/default
-LABEL
- KERNEL @@@server@@@::/menu.c32
- APPEND @@@server@@@::/pxelinux.cfg/default
-#####
-
-LABEL local
- MENU LABEL -1. ^Lokal booten
-# MENU PASSWD lokal
- localboot 0
-
-#####
-LABEL
- KERNEL @@@server@@@::/menu.c32
- APPEND @@@server@@@::/pxelinux.cfg/default
-#####
diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf
deleted file mode 100644
index 12f06df3..00000000
--- a/installer/default_files/dhcpd.conf
+++ /dev/null
@@ -1,138 +0,0 @@
-###################################################################
-##### #####
-##### !!! user defined vendor options !!! #####
-##### #####
-###################################################################
-
-option bootlocal-script code 221 = string;
-option language code 222 = string;
-option start-x code 223 = string;
-option start-snmp code 224 = string;
-option start-sshd code 225 = string;
-option start-xdmcp code 226 = string;
-option start-cron code 227 = string;
-option crontab-entries code 228 = string;
-option start-rwhod code 229 = string;
-option start-printdaemon code 230 = string;
-option desktop-session code 231 = string;
-option tex-enable code 232 = string;
-option netbios-workgroup code 233 = string;
-option vmware code 234 = string;
-option hw-mouse code 252 = string;
-option hw-graphic code 253 = string;
-option hw-monitor code 254 = string;
-
-# most of these options could be defined via machine-setup.default
-
-###################################################################
-##### #####
-##### !!! server specific options !!! #####
-##### #####
-###################################################################
-
-server-identifier @@@server@@@;
-next-server @@@server@@@;
-
-###################################################################
-##### #####
-##### !!! global options !!! #####
-##### #####
-###################################################################
-# description for several options:
-# option x-display-manager server01,server02,server03;
-# option netbios-name-servers 13.30.19.254;
-# option ntp-servers ntps1,ntps2,ntps3;
-#
-# type of graphical login/operation - indirect for
-# chooser, query for login kde,gnome,... for direct
-# graphical session (managed by startgui script)
-#
-# type of displaymanager to use (it should be installed
-# correctly on the server: XDMCP must be enabled then!)
-
-#deny unknown-clients;
-allow bootp;
-#allow booting;
-default-lease-time 160000;
-max-lease-time 200000;
-use-host-decl-names on;
-option dhcp-max-message-size 1024;
-ddns-update-style none;
-
-###################################################################
-##### #####
-##### !!! net specific options !!! #####
-##### #####
-###################################################################
-
-subnet @@@netname@@@ netmask @@@netmask@@@ {
- option broadcast-address @@@broadcast@@@;
- option routers @@@server@@@;
-}
-
-
-###################################################################
-##### #####
-##### GLOBAL-GROUP: #####
-##### Group for global options #####
-##### #####
-###################################################################
-
-group {
-
- if substring(option vendor-class-identifier,0,3) = "PXE" {
- allow booting;
- filename "@@@tftpbootdir@@@/pxelinux.0"; }
- elsif substring(option vendor-class-identifier,0,3) = "DXS" {
- allow booting; }
- elsif substring(option vendor-class-identifier,0,4) = "MSFT" {
- allow booting; }
-# else { ignore booting; }
-
-# option root-path "@@@rootdir@@@";
- option domain-name-servers 132.230.200.200,132.230.200.201;
- option domain-name "dxs.site";
- option ntp-servers 132.230.1.9;
-# option crontab-entries "59 21 * * * root shutdown -h now";
-# option lpr-servers 10.22.9.254;
-# option nis-servers 10.16.10.11;
-# option nis-domain "linuxpc";
-# option font-servers 10.16.10.61;
- option start-x "direct";
- option start-xdmcp "kdm";
- option start-rwhod "yes";
- option start-cron "yes";
- option start-snmp "no";
- option netbios-workgroup "tux-net";
- option tex-enable "yes";
- option vmware "no";
-# option vmware "nfs://server/pfad"; # alternative
- option desktop-session "kde,gnome";
- option language "de_DE de-latin1-nodeadkeys";
-# option hw-mouse "ps/2 psaux";
-# option hw-monitor "30-65kHz 58-76Hz 1280x1024";
-# option hw-graphic "nv 15";
- option bootlocal-script "";
-
-###################################################################
-##### #####
-##### GROUP 1: #####
-##### example group #####
-##### #####
-###################################################################
-
- group {
- option crontab-entries "";
-# group specific options:
-
- host example1 {
- hardware ethernet 00:02:B3:8D:83:12;
- fixed-address @@@example1@@@;
- }
- host example2 {
- hardware ethernet 00:50:56:0D:83:12;
- fixed-address @@@example2@@@;
- }
-
- }
-}
diff --git a/installer/default_files/hwdata/Cards.local b/installer/default_files/hwdata/Cards.local
deleted file mode 100644
index 61619686..00000000
--- a/installer/default_files/hwdata/Cards.local
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-# <SLX_BASE_PATH>/share/templates/hwdata/Cards.local
-#
-# Local changes to the Cards file. All additions should be documented here,
-# so that they are not lost ... They are prepended via mkdxsinitrd to the
-# main flat file database
-
-# Dell GX620
-NAME Intel 945
-CHIPSET Intel 945
-DRIVER i810
-NOCLOCKPROBE
-
-# IBM X41
-NAME Intel 915GM
-CHIPSET Intel 915
-DRIVER i810
-NOCLOCKPROBE
-
-# onboard NVidia grafix chip
-NAME NVIDIA GeForce 6100
-DRIVER nv
-NOCLOCKPROBE
-
-# HP AMD64 onboard ATI Radeon RS482
-NAME ATI Radeon RS482
-DRIVER radeon
-
-# link for fglrx, not used at the moment
-NAME ATI Radeon (fglrx)
-SEE ATI Radeon (generic)
-
-# link for Matrox G550 Dualhead
-NAME Matrox Millennium G550 DualHead
-SEE Matrox Millennium G550
-
-# link for VMware virtual SVGA
-NAME VMware virtual video card
-SEE VMware
-
-# main database
diff --git a/installer/default_files/hwdata/pcitable.local b/installer/default_files/hwdata/pcitable.local
deleted file mode 100644
index 5c7f370d..00000000
--- a/installer/default_files/hwdata/pcitable.local
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-# <SLX_BASE_PATH>/share/templates/hwdata/pcitable.local
-#
-# local changes to the pcitables file. All additions should be documented
-# here, so that they are not lost ... the pcitable file seems to be part of
-# RedHat (and others) hardware detection tool suite. These changes are
-# prepended via mkdxsinitrd to the main flat file database
-
-0x8086 0x2592 "Card:Intel 915GM"
-0x8086 0x2772 "Card:Intel 945"
-0x8086 0x2792 "Card:Intel 915GM"
-0x8086 0x2592 "Card:Intel 915"
-0x8086 0x266e "snd-intel8x0" "Intel Corp.|AC'97 Audio Controller"
-0x10de 0x0059 "snd-intel8x0" "nVidia Corporation|CK804 AC'97 Audio Controller"
-0x10de 0x0242 "Card:NVIDIA Geforce 6100"
-0x1002 0x5834 "Card:ATI Radeon"
-0x1002 0x5964 "Card:ATI Radeon RS482"
-0x1002 0x5974 "Card:ATI Radeon RS482"
-0x1002 0x5b60 "Card:ATI Radeon (generic)"
-0x1002 0x5b70 "Card:ATI Radeon (generic)"
-0x1002 0x5964 "Card:ATI Radeon (generic)"
-
-
-# main database
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
deleted file mode 100644
index ea8f00ee..00000000
--- a/installer/default_files/machine-setup.default
+++ /dev/null
@@ -1,137 +0,0 @@
-# machine-setup - this file is obsolete! Present for reference on
-# variable configuration only ...
-#
-#### default file, please modify, rename it to machine-setup and copy it
-#### to a proper location, like /var/opt/openslx/config/default/initramfs
-#### several of the settings could be passed via DHCP too (vendorspecific
-#### options, see dhcpd.conf example) - some settings could be done only
-#### within this file (no DHCP variable definition available)
-#
-# universal (distro independent) configuration file for slx linux diskless
-# client. It defines default values for several configuration variables.
-# These settings might be overwritten through various processes in initial
-# ramfs in stage3. New settings are simply appended, so that they might
-# overwrite previously defined variables
-#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 2006
-#
-# (c) 2003 - 2006 - RZ Universitaet Freiburg
-# (c) 2006 OpenSLX GmbH
-#
-# password of system administrator (root) as crypt -> 'dxs-root'
-# (will be changed soon) the password is not used if the admin provides
-# a passwd file via extended config tgz
-root_pw=@@@root_pw@@@
-
-# SLX-Group used at the moment only for VMware image / session assignment
-# to a specific group of clients
-#slxgrp=default
-
-## name service configuration defaults
-#
-# host and domain name
-host_name="dxs"
-domain_name="slx.test"
-
-# define country for all localization stuff - see functions how country
-# is translated to LANGUAGE, COUNTRY, LANG, KEYTABLE, XKEYBOARD,
-# KDEKEYBOARD, CHARSET, KDEKEYBOARDS, TZ and CONSOLEFONT
-country="de"
-
-## set some default variables
-#
-# enable setup of TeX environment
-tex_enable="no"
-
-## services to start (yes) or configure (may) or disable (no)
-#
-# network time protocol daemon ("yes" for normal daemon operation,
-# "initial" just for setting during startup with ntpdate)
-start_ntp="initial"
-# set timezone if not to be derived from language setting
-# timezone="Europe/Berlin"
-
-# start sshd (hostkeys should be pregenerated by install script)
-start_sshd="yes"
-
-# start log server (remote log servers could be either passed via dhcp option
-# or by giving the server URI instead of yes. udp and tcp are possible)
-# start_syslog="syslog://@@@serverip@@@:port/udp"
-# syslog to file (standard location depending on distribution)
-# start_syslog="file"
-# setting syslog to yes, info is written to console 10
-start_syslog="yes"
-
-# start cron service
-start_cron="no"
-
-# start at daemon
-start_atd="no"
-
-# simple network management protocol for system monitoring
-start_snmp="no"
-
-# configure print service (may require additional files in ConfTGZ)
-# cups|lpd|no
-start_printer="no"
-
-# dbus, resource manager, hal (hardware abstraction layer) interoperate
-# tighly. There might be little different solutions within each distro
-start_dreshal="yes"
-
-# start alsa sound system
-start_alsasound="yes"
-
-# smb protocol service (provide windows file service)
-start_samba="may"
-netbios_workgroup="dxs-network"
-
-# nfs v4
-#start_nfsv4="no"
-
-# automounter home (/local_dir - top level directories only) and source
-# (format (proto://)server/path)
-# if openslx server and server for the home is the same machine, you can
-# use @@@serverip@@@ instead of a fixed setting here
-#automnt_dir="/home"
-#automnt_src="(proto://)serverip/home"
-
-
-# scratch space on server "proto://serverip/slx/tmp"
-# if openslx server and server for the remote rw scratch is the same
-# machine, you can use @@@serverip@@@ instead of a fixed setting here
-#scratch="(proto://)serverip/dxs/tmp"
-
-# configure and start vmware services (use of @@@serverip@@@ is possible)
-vmware="no"
-#vmware="(proto://)serverip/dxs/vmware"
-# imgsrv is deprecated, because incorporated into vmware variable
-
-# kind of X11 display manager to run
-start_xdmcp="kdm"
-# for kdm/gdm - enable shutdown option on login screen "user/root/none"
-dm_allow_shutdown="user"
-
-# should Xorg/XFree server be started or some special windowmanager be run
-# in kiosk mode e.g. start_x="kde"
-start_x="yes"
-
-## hardware specific stuff
-# define type of mouse and protocol - not needed in most cases
-#hw_mouse="ps/2 psaux"
-
-# define kind of graphic server module and colordepth to use - autodetected
-# in most cases
-#hw_graphic=""
-
-# define monitor settings here, horizontal, vertical frequencies and maximum
-# screen resolution; useful to overide automatically detected characteristics
-# or if no ddc information is available
-#hw_monitor
-
-# set tvout feature for certain graphic cards - not needed for average systems
-# "yes" (then PAL is used) or tv standard as expected by card driver
-#tvout="yes"
-
-# sane network scanner
-#sane_scanner=""
diff --git a/installer/default_files/tftpboot/ethersel.c32 b/installer/default_files/tftpboot/ethersel.c32
deleted file mode 100755
index d0a86d4a..00000000
--- a/installer/default_files/tftpboot/ethersel.c32
+++ /dev/null
Binary files differ
diff --git a/installer/default_files/tftpboot/mboot.c32 b/installer/default_files/tftpboot/mboot.c32
deleted file mode 100755
index 722e9823..00000000
--- a/installer/default_files/tftpboot/mboot.c32
+++ /dev/null
Binary files differ