some minor steps in ld4-inst

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@89 95ad53e4-c205-0410-b2fa-d234c58c8868

6 files changed, 122 insertions, 13 deletions

diff --git a/installer/tftpboot/ethersel.c32 b/installer/default_files/tftpboot/ethersel.c32
index 97cf555b..97cf555b 100755
--- a/installer/tftpboot/ethersel.c32
+++ b/installer/default_files/tftpboot/ethersel.c32
diff --git a/installer/tftpboot/mboot.c32 b/installer/default_files/tftpboot/mboot.c32
index ccdd3ef3..ccdd3ef3 100755
--- a/installer/tftpboot/mboot.c32
+++ b/installer/default_files/tftpboot/mboot.c32
diff --git a/installer/tftpboot/menu.c32 b/installer/default_files/tftpboot/menu.c32
index f670fdb1..f670fdb1 100755
--- a/installer/tftpboot/menu.c32
+++ b/installer/default_files/tftpboot/menu.c32
diff --git a/installer/tftpboot/pxelinux.0 b/installer/default_files/tftpboot/pxelinux.0
index 5b38bd50..5b38bd50 100644
--- a/installer/tftpboot/pxelinux.0
+++ b/installer/default_files/tftpboot/pxelinux.0
diff --git a/installer/default_files/tftpboot/pxelinux.cfg/default b/installer/default_files/tftpboot/pxelinux.cfg/default
new file mode 100644
index 00000000..b1ac0d33
--- /dev/null
+++ b/installer/default_files/tftpboot/pxelinux.cfg/default
@@ -0,0 +1,92 @@
+# ~/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
+# Modification: Alexander Heinz
+#               Dirk von Suchodoletz <dirk@goe.net>, 23-09-2005
+#
+DEFAULT @@@server@@@::@@@tftpbootdir@@@/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 ::@@@tftpbootdir@@@/menu.c32
+   APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+LABEL
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32
+   APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+#####
+
+
+LABEL kr1
+   MENU LABEL 1. 10.0 NFS
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse10nfs
+   APPEND nfsroot=@@@server@@@:/nfsroot/sdc/10.0 vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-10nfs apic dhcp noldsc vci=DXS
+   ipappend 1
+
+LABEL kr2
+   MENU LABEL 1. 10.0 NBD
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse10nfs
+   APPEND nbdroot=@@@server@@@:5000,squashfs vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-10nfs apic dhcp noldsc vci=DXS
+   ipappend 1
+
+LABEL kr3
+   MENU LABEL 1. 10.0 DNBD
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse10nfs
+   APPEND dnbdroot=224.0.0.4:squashfs vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-10nfs apic dhcp noldsc vci=DXS elevator=noop
+   ipappend 1
+
+LABEL kr4
+   MENU LABEL 1. 10.1 NFS
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse101nfs
+   APPEND nfsroot=@@@server@@@:/nfsroot/10.1 vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-101nfs apic dhcp noldsc vci=DXS debug=1
+   ipappend 1
+
+LABEL kr5
+   MENU LABEL 1. 10.1 DNBD-SQFS
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse101nfs
+   APPEND dnbdroot=224.0.0.5:5001,squashfs vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-101nfs apic dhcp noldsc vci=DXS debug=0 elevator=noop
+   ipappend 1
+
+LABEL kr5a
+   MENU LABEL 1. 10.1 NBD-SQFS
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/suse101nfs
+   APPEND nbdroot=@@@server@@@:5000,squashfs vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-101nfs apic dhcp noldsc vci=DXS debug=0 elevator=anticipatory
+   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
+   ipappend 1
+
+LABEL kursraum
+   MENU LABEL 1. ^FLA Linux 2.6
+   KERNEL @@@server@@@::@@@tftpbootdir@@@/10.1
+   APPEND nfsroot=@@@server@@@:/nfsroot/10.1 vga=0x317 splash=silent initrd=initrd-10.1 apic dhcp
+   ipappend 1
+
+LABEL local
+   MENU LABEL 3. ^Lokal booten
+   MENU PASSWD lokal
+   localboot 0
+
+
+#####
+LABEL
+  KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32
+  APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default
+#####
+
diff --git a/installer/ld4-inst b/installer/ld4-inst
index b298230c..92381450 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -14,6 +14,7 @@ header() {
   echo
 }
 
+
 # check needed things for installation
 precheck() {
   # check if running as root
@@ -52,6 +53,7 @@ ask() {
   echo "$2=\"$back\"" >> .config
 }
 
+
 distro_check() {
   case "${!1}" in
     Debian*|debian*|Sarge*|sarge*)
@@ -88,13 +90,14 @@ distro_check() {
           eval "$2=\"10.0\""
         ;;
         10*)
-          eval "$2=\"10.0\""
+          eval "$2=\"10.1\""
         ;;
       esac
     ;;
   esac
 }
 
+
 configure() {
   export LANG="c"
   
@@ -146,6 +149,7 @@ configure() {
     fi
   fi
 
+  # das grosse frage-antwort-spiel:
   ask "Server distribution: " server_distro ${server_distro}
   distro_check server_distro server_distro_ver
   echo "Using ${server_distro} as server distribution"
@@ -156,7 +160,6 @@ configure() {
 
   . config-${server_distro}
   
-  # das grosse frage-antwort-spiel:
   ask "Path for client system: " rootdir $rootdir
   ask "Path for tftpboot: " tftpbootdir $tftpbootdir
   ask "Which network do you want to use for DXS? (A.B.C.0) " netname $netname
@@ -181,43 +184,57 @@ configure() {
 
 copy_system() {
   rsync -avDe ssh --delete --exclude-from=distro-specs/exclude-${client_distro} ${rsyncsource} ${rootdir}
+  # generate error message in case rsync didn't work and exit.
     
-  # mksquashfs
+  # mksquashfs (background process)
 }
 
+
 # setting up server site configuration files etc.
 setup_server () {
   # dhcp
   if [ -f ${dhcpd_conf} ] ; then
-    echo "Copying old dhcpd.conf to dhcpd.conf.bak"
-    mv ${dhcpd_conf} ${dhcpd_conf}.bak
+    echo "Copying old dhcpd.conf to dhcpd.conf.dxs.bak"
+    mv ${dhcpd_conf} ${dhcpd_conf}.dxs.bak
   fi
   cp default_files/dhcpd.conf ${dhcpd_conf}
-  sed -e "s,@@@server@@@,${server}"
+  sed -e "s,@@@server@@@,${server}," -i ${dhcpd_conf}
 
   # atftpd
   if [ -f ${atftpd_conf} ] ; then
-    echo "Copying old atftpd config file to ${atftpd_conf}.bak"
-    cp ${atftpd_conf} ${atftpd_conf}.bak
+    echo "Copying old atftpd config file to ${atftpd_conf}.dxs.bak"
+    cp ${atftpd_conf} ${atftpd_conf}.dxs.bak
   fi
-  sed -e 's,/tftpboot,${tftpbootdir},' -i ${atftpd_conf}
+  ## MISSING COPY - DISTRO SPECIFIC!!
+  sed -e "s,/tftpboot,${tftpbootdir}," -i ${atftpd_conf}
 
   # nfs
   exports_conf="/etc/exports"
   if [ -f ${exports_conf} ] ; then
-    echo "Copying old nfs export file to ${exports_conf}.bak"
-    mv ${exports_conf} ${exports_conf}.bak
+    echo "Copying old nfs export file to ${exports_conf}.dxs.bak"
+    mv ${exports_conf} ${exports_conf}.dxs.bak
   fi
+  echo "/nfsroot/dxs     ${netname}/${netmask}(ro,no_root_squash,async)" >> ${exports_conf}
   
-  # make services start
+  # pxe
+  if [ -e ${tftpbootdir} ] ; then
+    echo "Copying old tftpboot directory to ${tftpbootdir}.dxs.bak"
+    mv ${tftpbootdir} ${tftpbootdir}.dxs.bak
+  fi
+  cp -r default_files/tftpboot ${tftpbootdir}
+  sed -e "s,@@@server@@@,${server},g" -e "s,@@@tftpbootdir@@@,${tftpbootdir},g" -i ${tftpbootdir}/pxelinux.cfg/default
+
+  
+  # make services start  -- do we really want to do this?
 }
 
 
 create_initrd() {
-  # mkdxsinitrd
+  # ../mkdxsinitrd
 }
 
 
+
 ## ------ MAIN ------ ##
 
 header