summaryrefslogtreecommitdiffstats
path: root/installer/default_files
diff options
context:
space:
mode:
authorNico Dietrich2006-03-07 16:05:04 +0100
committerNico Dietrich2006-03-07 16:05:04 +0100
commitf4bc5fc188ee5dd09e15512dc5508df145ef25bd (patch)
treea6957cbc1f8c545a4c17e10894eb042e4d153b71 /installer/default_files
parentmore installer progress (diff)
downloadcore-f4bc5fc188ee5dd09e15512dc5508df145ef25bd.tar.gz
core-f4bc5fc188ee5dd09e15512dc5508df145ef25bd.tar.xz
core-f4bc5fc188ee5dd09e15512dc5508df145ef25bd.zip
further installer progress
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@91 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/default_files')
-rw-r--r--installer/default_files/dhcpd.conf2
-rw-r--r--installer/default_files/tftpboot/pxelinux.cfg/default8
2 files changed, 8 insertions, 2 deletions
diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf
index 210a9c8d..284d701c 100644
--- a/installer/default_files/dhcpd.conf
+++ b/installer/default_files/dhcpd.conf
@@ -109,7 +109,7 @@ ddns-update-style none;
##### #####
###################################################################
-subnet @@@netname@@@ @@@netmask@@@ {
+subnet @@@netname@@@ netmask @@@netmask@@@ {
option broadcast-address @@@broadcast@@@;
option routers @@@server@@@;
}
diff --git a/installer/default_files/tftpboot/pxelinux.cfg/default b/installer/default_files/tftpboot/pxelinux.cfg/default
index b1ac0d33..597c98c0 100644
--- a/installer/default_files/tftpboot/pxelinux.cfg/default
+++ b/installer/default_files/tftpboot/pxelinux.cfg/default
@@ -28,6 +28,13 @@ LABEL
APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
#####
+LABEL dxsdefault
+ MENU DEFAULT
+ MENU LABEL 1. @@@client_distro@@@-@@@client_distro_ver@@@ Diskless
+ KERNEL @@@server@@@::@@@tftpbootdir@@@/vmlinuz
+ APPEND nfsroot=@@@server@@@:@@@rootdir@@@ vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd apic dhcp noldsc vci=DXS
+ ipappend 1
+
LABEL kr1
MENU LABEL 1. 10.0 NFS
@@ -66,7 +73,6 @@ LABEL kr5a
ipappend 1
LABEL kr6
- MENU DEFAULT
MENU LABEL 1. 10.1 DNBD-EXT2
KERNEL @@@server@@@::@@@tftpbootdir@@@/suse101nfs
APPEND dnbdroot=224.0.0.6:5001,ext2 vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-101nfs apic dhcp noldsc vci=DXS debug=0 elevator=noop