From 75ee5e9200224d3c3e55368fb8981066658a3dac Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Thu, 9 Feb 2006 23:03:13 +0000 Subject: tests and extensions for distributed network block device ... git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@69 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/distro-specs/exclude-suse | 16 ++++---- installer/tftpboot/pxelinux.cfg/84E6045D | 67 -------------------------------- installer/tftpboot/pxelinux.cfg/default | 67 -------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) delete mode 100644 installer/tftpboot/pxelinux.cfg/84E6045D delete mode 100644 installer/tftpboot/pxelinux.cfg/default (limited to 'installer') diff --git a/installer/distro-specs/exclude-suse b/installer/distro-specs/exclude-suse index 940e556b..531171ce 100644 --- a/installer/distro-specs/exclude-suse +++ b/installer/distro-specs/exclude-suse @@ -1,7 +1,9 @@ -exclude="+ /bin\n+ /boot\n+ /etc\n+ /home\n+ /lib\n\ - + /media\n+ /mnt\n+ /opt\n+ /root\n+ /sbin\n+ /tmp\n+ /usr\n\ - + /var\n\ - - *~\n- *.rpmsave\n- *.rpmnew\n- *.YaST2save\n- *.old\n- *.bak\n\ - - /boot/initrd*\n- /boot/grub\n- /tmp/*\n- /root/*\n- /home/*\n\ - - /var/lib/YaST2/you/mnt/*\n- .svn\n- /var/tmp/*\n\ - - /usr/share/vmware/*\n- *lost+found*\n- /mnt/*\n- /media/*\n- /*" +exclude="+ /bin\n+ /boot\n+ /etc\n+ /home\n+ /lib\n+ /lib64\n\ ++ /media\n+ /mnt\n+ /opt\n+ /root\n+ /sbin\n+ /tmp\n+ /usr\n\ ++ /var\n\ +- *~\n- *.rpmsave\n- *.rpmnew\n- *.YaST2save\n- *.old\n- *.bak\n\ +- /lib/klibc/events/*\n\ +- /boot/initrd*\n- /boot/grub\n- /tmp/*\n- /root/*\n- /home/*\n\ +- /var/lib/YaST2/you/mnt/*\n- .svn\n- /var/tmp/*\n- /var/log/*\n\ +- /var/run/*\n- /var/spool/*\n- /var/lib/xdm\n\ +- /usr/share/vmware/*\n- *lost+found*\n- /mnt/*\n- /media/*\n- /*" diff --git a/installer/tftpboot/pxelinux.cfg/84E6045D b/installer/tftpboot/pxelinux.cfg/84E6045D deleted file mode 100644 index f318cf81..00000000 --- a/installer/tftpboot/pxelinux.cfg/84E6045D +++ /dev/null @@ -1,67 +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 -# Modification: Alexander Heinz -# Dirk von Suchodoletz , 23-09-2005 -# -DEFAULT @@@server@@@::@@@tftpbootdir@@@/menu.c32 - -PROMPT 0 -NOESCAPE 1 -TIMEOUT 600 -#IMPLICIT 1 -#ALLOWOPTIONS 1 -#ONERROR menu - -MENU MASTER PASSWD geheim - -MENU TITLE Linux Diskless Clients - Main Menu - - -##### -LABEL Bitte waehlen Sie mit den Pfeil-Tasten aus: - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -LABEL - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -##### - - -LABEL kursraum - MENU LABEL 1. ^Kursraumumgebung Linux SuSe 9.3 (VMWare 5.0) starten - MENU DEFAULT - KERNEL @@@server@@@::@@@tftpbootdir@@@/9.3 - APPEND nfsroot=@@@server@@@:/nfsroot/9.3 vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-9.3 apic dhcp - ipappend 1 - -LABEL suse93 - MENU LABEL 2. Neue Kursraumumgebung ^SuSE 9.3 mit VMplayer starten - KERNEL @@@server@@@::@@@tftpbootdir@@@/9.3-new - APPEND vga=0x317 nfsroot=@@@server@@@:/nfsroot/9.3-new vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-9.3-new apic dhcp - ipappend 1 - - -LABEL local - MENU LABEL 4. ^Lokal booten - MENU PASSWD lokal - localboot 0 - - -##### -LABEL - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -##### - - -LABEL halt - MENU LABEL c. ^Computer ausschalten - KERNEL @@@server@@@::@@@tftpbootdir@@@/atxoff.com - -LABEL help - MENU LABEL d. ^Hilfe - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/help - diff --git a/installer/tftpboot/pxelinux.cfg/default b/installer/tftpboot/pxelinux.cfg/default deleted file mode 100644 index 24e44e42..00000000 --- a/installer/tftpboot/pxelinux.cfg/default +++ /dev/null @@ -1,67 +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 -# Modification: Alexander Heinz -# Dirk von Suchodoletz , 23-09-2005 -# -DEFAULT @@@server@@@::@@@tftpbootdir@@@/menu.c32 - -PROMPT 0 -NOESCAPE 1 -TIMEOUT 600 -#IMPLICIT 1 -#ALLOWOPTIONS 1 -#ONERROR menu - -MENU MASTER PASSWD ganzgeheim - -MENU TITLE Linux Diskless Clients - Main Menu - - -##### -LABEL Bitte waehlen Sie mit den Pfeil-Tasten aus: - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -LABEL - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -##### - - -LABEL kursraum - MENU LABEL 1. ^Kursraumumgebung Linux SuSe 9.3 (VMWare 5.0) starten - MENU DEFAULT - KERNEL @@@server@@@::@@@tftpbootdir@@@/9.3 - APPEND nfsroot=@@@server@@@:/nfsroot/9.3 vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-9.3 apic dhcp - ipappend 1 - -LABEL suse93 - MENU LABEL 2. Neue Kursraumumgebung ^SuSE 9.3 mit VMplayer starten - KERNEL @@@server@@@::@@@tftpbootdir@@@/9.3-new - APPEND vga=0x317 nfsroot=@@@server@@@:/nfsroot/9.3-new vga=0x317 splash=silent initrd=@@@server@@@::@@@tftpbootdir@@@/initrd-9.3-new apic dhcp - ipappend 1 - - -LABEL local - MENU LABEL 4. ^Lokal booten - MENU PASSWD lokal - localboot 0 - - -##### -LABEL - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default -##### - - -LABEL halt - MENU LABEL c. ^Computer ausschalten - KERNEL @@@server@@@::@@@tftpbootdir@@@/atxoff.com - -LABEL help - MENU LABEL d. ^Hilfe - KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 - APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/help - -- cgit v1.2.3-55-g7522