From c92759835de754109c16949b1c6a0881476bd4de Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Fri, 3 Jul 2009 14:36:08 +0000 Subject: no need for different syslinux dirs, now everything inside syslinux git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2990 95ad53e4-c205-0410-b2fa-d234c58c8868 --- Makefile | 6 +- boot-env/OpenSLX/BootEnvironment/PXE.pm | 12 +-- boot-env/OpenSLX/BootEnvironment/Preboot/CD.pm | 99 ++++++++++++++++++------- boot-env/preboot/cd/iso/LICENSE | 3 - boot-env/preboot/cd/iso/README | 6 -- boot-env/preboot/cd/iso/isolinux/isolinux.bin | Bin 14336 -> 0 bytes boot-env/preboot/cd/iso/isolinux/menu.c32 | Bin 57140 -> 0 bytes boot-env/pxe/Readme.pxe | 67 ----------------- boot-env/pxe/initramfs-shutdown | Bin 665088 -> 0 bytes boot-env/pxe/kernel-shutdown | Bin 688752 -> 0 bytes boot-env/pxe/mboot.c32 | Bin 31148 -> 0 bytes boot-env/pxe/menu-bottom.example | 39 ---------- boot-env/pxe/menu-include.example | 58 --------------- boot-env/pxe/pxechain.com | Bin 998 -> 0 bytes boot-env/pxe/pxelinux.0 | Bin 16138 -> 0 bytes boot-env/pxe/themes/openslx/openslx.png | Bin 20453 -> 0 bytes boot-env/pxe/themes/openslx/theme.conf | 40 ---------- boot-env/pxe/vesamenu.c32 | Bin 147728 -> 0 bytes boot-env/syslinux/LICENSE | 3 + boot-env/syslinux/README.iso | 6 ++ boot-env/syslinux/README.pxe | 68 +++++++++++++++++ boot-env/syslinux/initramfs-shutdown | Bin 0 -> 665088 bytes boot-env/syslinux/isolinux.bin | Bin 0 -> 14336 bytes boot-env/syslinux/kernel-shutdown | Bin 0 -> 688752 bytes boot-env/syslinux/mboot.c32 | Bin 0 -> 31148 bytes boot-env/syslinux/pxechain.com | Bin 0 -> 998 bytes boot-env/syslinux/pxelinux.0 | Bin 0 -> 16138 bytes boot-env/syslinux/pxemenu-bottom.example | 39 ++++++++++ boot-env/syslinux/pxemenu-include.example | 58 +++++++++++++++ boot-env/syslinux/themes/openslx/openslx.png | Bin 0 -> 20453 bytes boot-env/syslinux/themes/openslx/theme.conf | 40 ++++++++++ boot-env/syslinux/vesamenu.c32 | Bin 0 -> 147728 bytes lib/OpenSLX/Basics.pm | 2 +- 33 files changed, 297 insertions(+), 249 deletions(-) delete mode 100644 boot-env/preboot/cd/iso/LICENSE delete mode 100644 boot-env/preboot/cd/iso/README delete mode 100644 boot-env/preboot/cd/iso/isolinux/isolinux.bin delete mode 100755 boot-env/preboot/cd/iso/isolinux/menu.c32 delete mode 100644 boot-env/pxe/Readme.pxe delete mode 100644 boot-env/pxe/initramfs-shutdown delete mode 100644 boot-env/pxe/kernel-shutdown delete mode 100755 boot-env/pxe/mboot.c32 delete mode 100644 boot-env/pxe/menu-bottom.example delete mode 100644 boot-env/pxe/menu-include.example delete mode 100644 boot-env/pxe/pxechain.com delete mode 100644 boot-env/pxe/pxelinux.0 delete mode 100644 boot-env/pxe/themes/openslx/openslx.png delete mode 100644 boot-env/pxe/themes/openslx/theme.conf delete mode 100755 boot-env/pxe/vesamenu.c32 create mode 100644 boot-env/syslinux/LICENSE create mode 100644 boot-env/syslinux/README.iso create mode 100644 boot-env/syslinux/README.pxe create mode 100644 boot-env/syslinux/initramfs-shutdown create mode 100644 boot-env/syslinux/isolinux.bin create mode 100644 boot-env/syslinux/kernel-shutdown create mode 100755 boot-env/syslinux/mboot.c32 create mode 100644 boot-env/syslinux/pxechain.com create mode 100644 boot-env/syslinux/pxelinux.0 create mode 100644 boot-env/syslinux/pxemenu-bottom.example create mode 100644 boot-env/syslinux/pxemenu-include.example create mode 100644 boot-env/syslinux/themes/openslx/openslx.png create mode 100644 boot-env/syslinux/themes/openslx/theme.conf create mode 100755 boot-env/syslinux/vesamenu.c32 diff --git a/Makefile b/Makefile index 10225266..07929f55 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ supported."; \ plain-install: @if test "${TRACE_INSTALLATION}" = "1"; then set -x; fi; \ echo "Installing OpenSLX project files"; \ - mkdir -p $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/pxe/themes \ + mkdir -p $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/syslinux/themes \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/lib \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/bin \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/boot-env \ @@ -192,8 +192,8 @@ plain-install: tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ tar --exclude=.svn --exclude *.example --exclude OpenSLX -cp boot-env | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/; \ - cp -p boot-env/pxe/menu-*.example boot-env/pxe/Readme.pxe \ - $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/pxe/; \ + cp -p boot-env/syslinux/pxemenu-*.example boot-env/syslinux/README.pxe \ + $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/syslinux/; \ cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \ tar --exclude=.svn -cp -C initramfs tpm | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm index 35b0a3b8..ceb9e1de 100644 --- a/boot-env/OpenSLX/BootEnvironment/PXE.pm +++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm @@ -166,7 +166,7 @@ sub writeBootloaderMenuFor $pxeConfig .= $slxLabels; # fetch PXE-bottom iclude, if exists (overwrite existing definitions) my $pxeBottomFile - = "$openslxConfig{'config-path'}/boot-env/pxe/menu-bottom"; + = "$openslxConfig{'config-path'}/boot-env/syslinux/pxemenu-bottom"; if (-e $pxeBottomFile) { $pxeConfig .= "\n# configuration from include $pxeBottomFile\n"; $pxeConfig .= slurpFile($pxeBottomFile); @@ -189,7 +189,7 @@ sub _getTemplate my $basePath = $openslxConfig{'base-path'}; my $configPath = $openslxConfig{'config-path'}; - my $pxeTheme = $openslxConfig{'pxe-theme'}; + my $pxeTheme = $openslxConfig{'syslinux-theme'}; my ($sec, $min, $hour, $day, $mon, $year) = (localtime); $mon++; @@ -210,9 +210,9 @@ sub _getTemplate # let user stuff in config path win over our stuff in base path my $pxeThemePath; my $pxeThemeInConfig - = "$configPath/boot-env/pxe/themes/${pxeTheme}"; + = "$configPath/boot-env/syslinux/themes/${pxeTheme}"; my $pxeThemeInBase - = "$basePath/share/boot-env/pxe/themes/${pxeTheme}"; + = "$basePath/share/boot-env/syslinux/themes/${pxeTheme}"; if (-e "$pxeThemeInConfig/theme.conf") { $pxeThemePath = $pxeThemeInConfig; } @@ -251,7 +251,7 @@ sub _getTemplate # fetch PXE-include, if exists (overwrite existing definitions) my $pxeIncludeFile - = "$openslxConfig{'config-path'}/boot-env/pxe/menu-include"; + = "$openslxConfig{'config-path'}/boot-env/syslinux/pxemenu-include"; if (-e $pxeIncludeFile) { $pxeTemplate .= "\n# configuration from include $pxeIncludeFile\n"; $pxeTemplate .= slurpFile($pxeIncludeFile); @@ -279,7 +279,7 @@ sub _prepareBootloaderConfigFolder 'mboot.c32', 'kernel-shutdown', 'initramfs-shutdown') { if (!-e "$pxePath/$file") { slxsystem( - qq[cp -p "$basePath/share/boot-env/pxe/$file" $pxePath/] + qq[cp -p "$basePath/share/boot-env/syslinux/$file" $pxePath/] ); } } diff --git a/boot-env/OpenSLX/BootEnvironment/Preboot/CD.pm b/boot-env/OpenSLX/BootEnvironment/Preboot/CD.pm index 7fc61875..a6c36cd7 100644 --- a/boot-env/OpenSLX/BootEnvironment/Preboot/CD.pm +++ b/boot-env/OpenSLX/BootEnvironment/Preboot/CD.pm @@ -29,7 +29,7 @@ sub createImage my $self = shift; my $client = shift; my $info = shift; - + vlog( 0, _tr( @@ -39,48 +39,95 @@ sub createImage ); my $imageDir = "$openslxConfig{'public-path'}/images/$client->{name}/cd"; - mkpath($imageDir) unless $self->{'dry-run'}; + my $isoDir = "$imageDir/iso/isolinux"; + mkpath($isoDir) unless $self->{'dry-run'}; # copy static data - my $dataDir = "$openslxConfig{'base-path'}/share/boot-env/preboot/cd"; - slxsystem(qq{rsync -rlpt $dataDir/iso "$imageDir/"}) - unless $self->{'dry-run'}; + my $dataDir = "$openslxConfig{'base-path'}/share/boot-env/syslinux"; + for my $file ('LICENSE', 'README.iso', 'vesamenu.c32', 'isolinux.bin') { + if (!-e "$isoDir/$file") { + slxsystem( + qq[cp -p "$dataDir/$file" "$isoDir/"] + ) + unless $self->{'dry-run'}; + } + } # copy kernel (take the one from the given system info) my $kernelFile = $info->{'kernel-file'}; my $kernelName = basename($kernelFile); - slxsystem(qq{cp -p "$kernelFile" "$imageDir/iso/isolinux/vmlinuz"}) + slxsystem(qq{cp -p "$kernelFile" "$isoDir/vmlinuz"}) unless $self->{'dry-run'}; # create initramfs - my $initramfsName = qq{"$imageDir/iso/isolinux/initramfs"}; + my $initramfsName = qq{"$isoDir/initramfs"}; $self->makePrebootInitRamFS($info, $initramfsName, $client); # write trivial isolinux config - my $isolinuxConfig = unshiftHereDoc(<<" End-of-Here"); - PROMPT 0 - TIMEOUT 100 - DEFAULT menu.c32 + # include static defaults + my $isolinuxConfig = "DEFAULT vesamenu.c32\n"; + $isolinuxConfig .= "PROMPT 0\n"; + $isolinuxConfig .= "TIMEOUT 100\n"; + + # theme stuff + my $basePath = $openslxConfig{'base-path'}; + my $configPath = $openslxConfig{'config-path'}; + my $isoTheme = $openslxConfig{'syslinux-theme'}; + + my $isoThemePath; + my $isoThemeInConfig + = "$configPath/boot-env/syslinux/themes/${isoTheme}"; + my $isoThemeInBase + = "$basePath/share/boot-env/syslinux/themes/${isoTheme}"; + if (-e "$isoThemeInConfig/theme.conf") { + $isoThemePath = $isoThemeInConfig; + } + else { + if (-e "$isoThemeInBase/theme.conf") { + $isoThemePath = $isoThemeInBase; + } + } + # include theme specific stuff + if (defined $isoThemePath) { + $isolinuxConfig .= slurpFile("$isoThemePath/theme.conf"); + } + + # copy background picture if exists + my $pic; + if (defined $isoTheme) { + while ($isolinuxConfig =~ m{^\s*MENU BACKGROUND (\S+?)\s*$}gims) { + chomp($pic = $1); + } + } + if (defined $pic) { + my $isoBackground = "$isoThemePath/$pic"; + if (-e $isoBackground && !$self->{'dry-run'}) { + slxsystem(qq[cp "$isoBackground" "$isoDir/"]); + } + } + + # write trivial isolinux config + $isolinuxConfig .= unshiftHereDoc(<<" End-of-Here"); MENU TITLE Welcome to OpenSLX PreBoot ISO/CD (Mini Linux/Kexec) LABEL SLXSTDBOOT - MENU LABEL OpenSLX PreBoot - Stateless Netboot Linux ... - MENU DEFAULT - KERNEL vmlinuz - APPEND initrd=initramfs vga=0x317 - TEXT HELP + MENU LABEL OpenSLX PreBoot - Stateless Netboot Linux ... + MENU DEFAULT + KERNEL vmlinuz + APPEND initrd=initramfs vga=0x317 + TEXT HELP Use this (default) entry if you have configured your client. - You have chance to edit the kernel commandline by hitting the - TAB key (e.g. for adding debug=3 to it for bug hunting) ... - ENDTEXT + You have chance to edit the kernel commandline by hitting + the TAB key (e.g. for adding debug=3 to it for bug hunting). + ENDTEXT LABEL LOCALBOOT - MENU LABEL Boot locally (skip OpenSLX PreBoot) ... - LOCALBOOT -1 - TEXT HELP - Gets you out of here by booting from next device in BIOS boot - order. - ENDTEXT + MENU LABEL Boot locally (skip OpenSLX PreBoot) ... + LOCALBOOT -1 + TEXT HELP + Gets you out of here by booting from next device in BIOS + boot order. + ENDTEXT End-of-Here - spitFile("$imageDir/iso/isolinux/isolinux.cfg", $isolinuxConfig); + spitFile("$isoDir/isolinux.cfg", $isolinuxConfig); my $mkisoCmd = unshiftHereDoc(<<" End-of-Here"); mkisofs diff --git a/boot-env/preboot/cd/iso/LICENSE b/boot-env/preboot/cd/iso/LICENSE deleted file mode 100644 index 7233bc7e..00000000 --- a/boot-env/preboot/cd/iso/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -This package is free software distributed under the GPL version 2. -See http://openslx.org/COPYING. For additional information on the -SYSLINUX component by H.P. Anwin check http://syslinux.zytor.com! diff --git a/boot-env/preboot/cd/iso/README b/boot-env/preboot/cd/iso/README deleted file mode 100644 index f9abdbea..00000000 --- a/boot-env/preboot/cd/iso/README +++ /dev/null @@ -1,6 +0,0 @@ -You seem to have the OpenSLX network demo CD/DVD still in your optical -drive! This is not required. You may safely remove the medium just -after the first kernel/initramfs is loaded ... - -If you have any feedback please consult http://openslx.org/feedback -and send your comments to feedback@openslx.org! diff --git a/boot-env/preboot/cd/iso/isolinux/isolinux.bin b/boot-env/preboot/cd/iso/isolinux/isolinux.bin deleted file mode 100644 index 80f71c98..00000000 Binary files a/boot-env/preboot/cd/iso/isolinux/isolinux.bin and /dev/null differ diff --git a/boot-env/preboot/cd/iso/isolinux/menu.c32 b/boot-env/preboot/cd/iso/isolinux/menu.c32 deleted file mode 100755 index 9413ec46..00000000 Binary files a/boot-env/preboot/cd/iso/isolinux/menu.c32 and /dev/null differ diff --git a/boot-env/pxe/Readme.pxe b/boot-env/pxe/Readme.pxe deleted file mode 100644 index 84fea704..00000000 --- a/boot-env/pxe/Readme.pxe +++ /dev/null @@ -1,67 +0,0 @@ -The PXE stuff uses HPAs syslinux, see http://syslinux.zytor.com! - -Example how the PXElinux information is gathered: - -############################## PXElinux-menu file ############################## -##### first static information is written, can't be changed ##### -##### override with include-menu (except DEFAULT vesamenu.c32) ##### -# # -# DEFAULT vesamenu.c32 # -# NOESCAPE 0 # -# PROMPT 0 # -# # -##### then theme specific information is written (if theme specified) ##### -##### ##### -# # -# MENU BACKGROUND openslx.png # -# MENU WIDTH 78 # -# . # -# . # -# menu color unsel 37;40 #fff0f0f0 #ff8093a1 std # -# . # -# . # -# . # -# # -##### now slxsettings configuration is being read ##### -##### ##### -# # -# TIMEOUT 100 # -# TOTALTIMEOUT 600 # -# MENU MASTER PASSWD secret # -# MENU TITLE Welcome to OpenSLX # -# # -##### after this /etc/opt/openslx/boot-env/pxe/menu-include is included ##### -##### if it is existing, overriding above statements ##### -# # -# MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben: # -# MENU AUTOBOOT Auswahl startet in # Sekunden # -# . # -# . # -# . # -# # -##### at this point the system labels are being included ##### -##### ##### -# # -# LABEL openslx-suse-11.0-default::nfs # -# MENU LABEL ^SUSE 11.0 System / NFS # -# KERNEL suse-11.0-default/vmlinuz-2.6.25.20-0.1-pae # -# APPEND quiet vga=791 initrd=suse-11.0-default/initramfs-1 file # -# IPAPPEND 3 # -# TEXT HELP # -# OpenSUSE 11.0 System # -# ENDTEXT # -# . # -# . # -# . # -# # -##### at the end /etc/opt/openslx/boot-env/pxe/menu-bottom is being incl. ##### -##### if existing, please specify only systems and further menus ##### -# # -# MENU SEPARATOR # -# LABEL test # -# MENU LABEL ^Testmenu # -# MENU PASSWD test # -# KERNEL pxechain.com # -# APPEND 192.168.1.1::pxelinux.0 # -# # -########################## End of PXElinux-menu file ########################### diff --git a/boot-env/pxe/initramfs-shutdown b/boot-env/pxe/initramfs-shutdown deleted file mode 100644 index 3e4376bd..00000000 Binary files a/boot-env/pxe/initramfs-shutdown and /dev/null differ diff --git a/boot-env/pxe/kernel-shutdown b/boot-env/pxe/kernel-shutdown deleted file mode 100644 index ddb180dd..00000000 Binary files a/boot-env/pxe/kernel-shutdown and /dev/null differ diff --git a/boot-env/pxe/mboot.c32 b/boot-env/pxe/mboot.c32 deleted file mode 100755 index dfff3789..00000000 Binary files a/boot-env/pxe/mboot.c32 and /dev/null differ diff --git a/boot-env/pxe/menu-bottom.example b/boot-env/pxe/menu-bottom.example deleted file mode 100644 index 6e580a03..00000000 --- a/boot-env/pxe/menu-bottom.example +++ /dev/null @@ -1,39 +0,0 @@ -# this include file will be loaded at the bottom of the menu after the system -# labels, please define only further menus and systems -# for theme configuration use theme.conf in your theme directory -# general settings can be set via slxsettings -# please copy to menu-bottom if needed - -## example: shutdown label in menu -#LABEL shutdown -# MENU LABEL ^Shutdown PC -# KERNEL kernel-shutdown -# APPEND initrd=initramfs-shutdown quiet - -## help label not selectable -#LABEL help -# MENU LABEL Press 'F1' for help -# MENU DISABLE - -## example: add an additional menu on the same tftp server -#LABEL test -# MENU LABEL ^Testmeu -# KERNEL vesamenu.c32 -# APPEND testmenu - -## example: add an additional menu on a different tftp server, with passwd -#LABEL test2 -# MENU LABEL ^Testmeu -# MENU PASSWD test -# KERNEL pxechain.com -# APPEND 192.168.101.102::pxelinux.0 - -## example blank line / menu separator -#MENU SEPARATOR - -## example localboot with passwd -#LABEL local -# MENU LABEL Boot from local ^Harddisk -# MENU PASSWD local -# localboot 0 - diff --git a/boot-env/pxe/menu-include.example b/boot-env/pxe/menu-include.example deleted file mode 100644 index 9f36df23..00000000 --- a/boot-env/pxe/menu-include.example +++ /dev/null @@ -1,58 +0,0 @@ -# this include file will be loaded at the end of theme and slxsettings -# configuration but right before the system labels -# it will overwrite existing defs -# for theme configuration use theme.conf in your theme directory -# general settings can be set via slxsettings -# please copy to menu-include if needed - -## example german help: -#MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben: -#MENU AUTOBOOT Auswahl startet in # Sekunden - -## example: shutdown on timeout -#ONTIMEOUT shutdown -#LABEL shutdown -# MENU HIDE -# KERNEL kernel-shutdown -# APPEND initrd=initramfs-shutdown quiet - -## example: shutdown label in menu -#LABEL shutdown2 -# MENU LABEL ^Shutdown PC -# KERNEL kernel-shutdown -# APPEND initrd=initramfs-shutdown quiet - -## help/... text on F1 keypress -#F1 help_01.txt -## optionally with info -#LABEL help -# MENU LABEL Press 'F1' for help -# MENU DISABLE - -## example: add an additional menu on the same tftp server -#LABEL test -# MENU LABEL ^Testmeu -# KERNEL vesamenu.c32 -# APPEND testmenu - -## example: add an additional menu on a different tftp server, with passwd -#LABEL test2 -# MENU LABEL ^Testmeu -# MENU PASSWD test -# KERNEL pxechain.com -# APPEND 192.168.101.102::pxelinux.0 - -## example non-selectable line -#LABEL - -# MENU LABEL ________________________________________________________ -# MENU DISABLE - -## example blank line / menu separator -#MENU SEPARATOR - -## example localboot with passwd -#LABEL local -# MENU LABEL Boot from local ^Harddisk -# MENU PASSWD local -# localboot 0 - diff --git a/boot-env/pxe/pxechain.com b/boot-env/pxe/pxechain.com deleted file mode 100644 index 8c4e0c5b..00000000 Binary files a/boot-env/pxe/pxechain.com and /dev/null differ diff --git a/boot-env/pxe/pxelinux.0 b/boot-env/pxe/pxelinux.0 deleted file mode 100644 index 743948e3..00000000 Binary files a/boot-env/pxe/pxelinux.0 and /dev/null differ diff --git a/boot-env/pxe/themes/openslx/openslx.png b/boot-env/pxe/themes/openslx/openslx.png deleted file mode 100644 index ccf8cc0a..00000000 Binary files a/boot-env/pxe/themes/openslx/openslx.png and /dev/null differ diff --git a/boot-env/pxe/themes/openslx/theme.conf b/boot-env/pxe/themes/openslx/theme.conf deleted file mode 100644 index c1fab72b..00000000 --- a/boot-env/pxe/themes/openslx/theme.conf +++ /dev/null @@ -1,40 +0,0 @@ -# openslx theme style definition -# please define only look of your theme -# for non-theme definitions use slxsettings -# or include file in /etc/opt/openslx/boot-env/pxe/menu-include - -MENU BACKGROUND openslx.png -MENU WIDTH 78 -MENU MARGIN 9 -MENU PASSWORDMARGIN 9 -MENU ROWS 10 -MENU TABMSGROW 16 -MENU CMDLINEROW 16 -MENU ENDROW -1 -MENU PASSWORDROW 16 -MENU TIMEOUTROW 20 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW -1 -MENU HSHIFT 0 -MENU VSHIFT 7 - -menu color screen 37;40 #80ffffff #00000000 std -menu color border 37;40 #40000000 #ff8093a1 std -menu color title 1;37;40 #ffff8b00 #ff8093a1 std -menu color unsel 37;40 #fff0f0f0 #ff8093a1 std -menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std -menu color sel 7;37;40 #ff1c2a33 #667799bb all -menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all -menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std -menu color scrollbar 37;40 #40000000 #ee000000 std -menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std -menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std -menu color cmdline 37;40 #fff0f0f0 #ff8093a1 std -menu color pwdborder 37;40 #40000000 #ff8093a1 std -menu color pwdheader 37;40 #ffff8b00 #ff8093a1 std -menu color pwdentry 37;40 #ffff8b00 #ff8093a1 std -menu color timeout_msg 37;40 #fff0f0f0 #ff8093a1 std -menu color timeout 1;37;40 #ffff8b00 #ff8093a1 std -menu color help 37;40 #ff1c2a33 #00000000 none -MENU MSGCOLOR #ff1c2a33 #00000000 none - diff --git a/boot-env/pxe/vesamenu.c32 b/boot-env/pxe/vesamenu.c32 deleted file mode 100755 index d9884770..00000000 Binary files a/boot-env/pxe/vesamenu.c32 and /dev/null differ diff --git a/boot-env/syslinux/LICENSE b/boot-env/syslinux/LICENSE new file mode 100644 index 00000000..7233bc7e --- /dev/null +++ b/boot-env/syslinux/LICENSE @@ -0,0 +1,3 @@ +This package is free software distributed under the GPL version 2. +See http://openslx.org/COPYING. For additional information on the +SYSLINUX component by H.P. Anwin check http://syslinux.zytor.com! diff --git a/boot-env/syslinux/README.iso b/boot-env/syslinux/README.iso new file mode 100644 index 00000000..f9abdbea --- /dev/null +++ b/boot-env/syslinux/README.iso @@ -0,0 +1,6 @@ +You seem to have the OpenSLX network demo CD/DVD still in your optical +drive! This is not required. You may safely remove the medium just +after the first kernel/initramfs is loaded ... + +If you have any feedback please consult http://openslx.org/feedback +and send your comments to feedback@openslx.org! diff --git a/boot-env/syslinux/README.pxe b/boot-env/syslinux/README.pxe new file mode 100644 index 00000000..9a14ee52 --- /dev/null +++ b/boot-env/syslinux/README.pxe @@ -0,0 +1,68 @@ +The PXE stuff uses HPAs syslinux, see http://syslinux.zytor.com! + +Example how the PXElinux information is gathered: + +############################## PXElinux-menu file ############################## +##### first static information is written, can't be changed ##### +##### override with include-menu (except DEFAULT vesamenu.c32) ##### +# # +# DEFAULT vesamenu.c32 # +# NOESCAPE 0 # +# PROMPT 0 # +# # +##### then theme specific information is written (if theme specified) ##### +##### ##### +# # +# MENU BACKGROUND openslx.png # +# MENU WIDTH 78 # +# . # +# . # +# menu color unsel 37;40 #fff0f0f0 #ff8093a1 std # +# . # +# . # +# . # +# # +##### now slxsettings configuration is being read ##### +##### ##### +# # +# TIMEOUT 100 # +# TOTALTIMEOUT 600 # +# MENU MASTER PASSWD secret # +# MENU TITLE Welcome to OpenSLX # +# # +##### after this /etc/opt/openslx/boot-env/syslinux/pxemenu-include is ##### +##### included if it is existing, overriding above statements ##### +# # +# MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben: # +# MENU AUTOBOOT Auswahl startet in # Sekunden # +# . # +# . # +# . # +# # +##### at this point the system labels are being included ##### +##### ##### +# # +# LABEL openslx-suse-11.0-default::nfs # +# MENU LABEL ^SUSE 11.0 System / NFS # +# KERNEL suse-11.0-default/vmlinuz-2.6.25.20-0.1-pae # +# APPEND quiet vga=791 initrd=suse-11.0-default/initramfs-1 file # +# IPAPPEND 3 # +# TEXT HELP # +# OpenSUSE 11.0 System # +# ENDTEXT # +# . # +# . # +# . # +# # +##### at the end /etc/opt/openslx/boot-env/syslinux/pxemenu-bottom is ##### +##### being incl. if existing ##### +##### please specify only systems and further menus ##### +# # +# MENU SEPARATOR # +# LABEL test # +# MENU LABEL ^Testmenu # +# MENU PASSWD test # +# KERNEL pxechain.com # +# APPEND 192.168.1.1::pxelinux.0 # +# # +########################## End of PXElinux-menu file ########################### diff --git a/boot-env/syslinux/initramfs-shutdown b/boot-env/syslinux/initramfs-shutdown new file mode 100644 index 00000000..3e4376bd Binary files /dev/null and b/boot-env/syslinux/initramfs-shutdown differ diff --git a/boot-env/syslinux/isolinux.bin b/boot-env/syslinux/isolinux.bin new file mode 100644 index 00000000..80f71c98 Binary files /dev/null and b/boot-env/syslinux/isolinux.bin differ diff --git a/boot-env/syslinux/kernel-shutdown b/boot-env/syslinux/kernel-shutdown new file mode 100644 index 00000000..ddb180dd Binary files /dev/null and b/boot-env/syslinux/kernel-shutdown differ diff --git a/boot-env/syslinux/mboot.c32 b/boot-env/syslinux/mboot.c32 new file mode 100755 index 00000000..dfff3789 Binary files /dev/null and b/boot-env/syslinux/mboot.c32 differ diff --git a/boot-env/syslinux/pxechain.com b/boot-env/syslinux/pxechain.com new file mode 100644 index 00000000..8c4e0c5b Binary files /dev/null and b/boot-env/syslinux/pxechain.com differ diff --git a/boot-env/syslinux/pxelinux.0 b/boot-env/syslinux/pxelinux.0 new file mode 100644 index 00000000..743948e3 Binary files /dev/null and b/boot-env/syslinux/pxelinux.0 differ diff --git a/boot-env/syslinux/pxemenu-bottom.example b/boot-env/syslinux/pxemenu-bottom.example new file mode 100644 index 00000000..29ceee3c --- /dev/null +++ b/boot-env/syslinux/pxemenu-bottom.example @@ -0,0 +1,39 @@ +# this include file will be loaded at the bottom of the menu after the system +# labels, please define only further menus and systems +# for theme configuration use theme.conf in your theme directory +# general settings can be set via slxsettings +# please copy to pxemenu-bottom if needed + +## example: shutdown label in menu +#LABEL shutdown +# MENU LABEL ^Shutdown PC +# KERNEL kernel-shutdown +# APPEND initrd=initramfs-shutdown quiet + +## help label not selectable +#LABEL help +# MENU LABEL Press 'F1' for help +# MENU DISABLE + +## example: add an additional menu on the same tftp server +#LABEL test +# MENU LABEL ^Testmeu +# KERNEL vesamenu.c32 +# APPEND testmenu + +## example: add an additional menu on a different tftp server, with passwd +#LABEL test2 +# MENU LABEL ^Testmeu +# MENU PASSWD test +# KERNEL pxechain.com +# APPEND 192.168.101.102::pxelinux.0 + +## example blank line / menu separator +#MENU SEPARATOR + +## example localboot with passwd +#LABEL local +# MENU LABEL Boot from local ^Harddisk +# MENU PASSWD local +# localboot 0 + diff --git a/boot-env/syslinux/pxemenu-include.example b/boot-env/syslinux/pxemenu-include.example new file mode 100644 index 00000000..c09f8e70 --- /dev/null +++ b/boot-env/syslinux/pxemenu-include.example @@ -0,0 +1,58 @@ +# this include file will be loaded at the end of theme and slxsettings +# configuration but right before the system labels +# it will overwrite existing defs +# for theme configuration use theme.conf in your theme directory +# general settings can be set via slxsettings +# please copy to pxemenu-include if needed + +## example german help: +#MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben: +#MENU AUTOBOOT Auswahl startet in # Sekunden + +## example: shutdown on timeout +#ONTIMEOUT shutdown +#LABEL shutdown +# MENU HIDE +# KERNEL kernel-shutdown +# APPEND initrd=initramfs-shutdown quiet + +## example: shutdown label in menu +#LABEL shutdown2 +# MENU LABEL ^Shutdown PC +# KERNEL kernel-shutdown +# APPEND initrd=initramfs-shutdown quiet + +## help/... text on F1 keypress +#F1 help_01.txt +## optionally with info +#LABEL help +# MENU LABEL Press 'F1' for help +# MENU DISABLE + +## example: add an additional menu on the same tftp server +#LABEL test +# MENU LABEL ^Testmeu +# KERNEL vesamenu.c32 +# APPEND testmenu + +## example: add an additional menu on a different tftp server, with passwd +#LABEL test2 +# MENU LABEL ^Testmeu +# MENU PASSWD test +# KERNEL pxechain.com +# APPEND 192.168.101.102::pxelinux.0 + +## example non-selectable line +#LABEL - +# MENU LABEL ________________________________________________________ +# MENU DISABLE + +## example blank line / menu separator +#MENU SEPARATOR + +## example localboot with passwd +#LABEL local +# MENU LABEL Boot from local ^Harddisk +# MENU PASSWD local +# localboot 0 + diff --git a/boot-env/syslinux/themes/openslx/openslx.png b/boot-env/syslinux/themes/openslx/openslx.png new file mode 100644 index 00000000..ccf8cc0a Binary files /dev/null and b/boot-env/syslinux/themes/openslx/openslx.png differ diff --git a/boot-env/syslinux/themes/openslx/theme.conf b/boot-env/syslinux/themes/openslx/theme.conf new file mode 100644 index 00000000..e28562d6 --- /dev/null +++ b/boot-env/syslinux/themes/openslx/theme.conf @@ -0,0 +1,40 @@ +# openslx theme style definition +# please define only look of your theme +# for non-theme definitions use slxsettings +# or include file in /etc/opt/openslx/boot-env/syslinux/pxemenu-include + +MENU BACKGROUND openslx.png +MENU WIDTH 78 +MENU MARGIN 9 +MENU PASSWORDMARGIN 9 +MENU ROWS 10 +MENU TABMSGROW 16 +MENU CMDLINEROW 16 +MENU ENDROW -1 +MENU PASSWORDROW 16 +MENU TIMEOUTROW 20 +MENU HELPMSGROW 16 +MENU HELPMSGENDROW -1 +MENU HSHIFT 0 +MENU VSHIFT 7 + +menu color screen 37;40 #80ffffff #00000000 std +menu color border 37;40 #40000000 #ff8093a1 std +menu color title 1;37;40 #ffff8b00 #ff8093a1 std +menu color unsel 37;40 #fff0f0f0 #ff8093a1 std +menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std +menu color sel 7;37;40 #ff1c2a33 #667799bb all +menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all +menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std +menu color scrollbar 37;40 #40000000 #ee000000 std +menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std +menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std +menu color cmdline 37;40 #fff0f0f0 #ff8093a1 std +menu color pwdborder 37;40 #40000000 #ff8093a1 std +menu color pwdheader 37;40 #ffff8b00 #ff8093a1 std +menu color pwdentry 37;40 #ffff8b00 #ff8093a1 std +menu color timeout_msg 37;40 #fff0f0f0 #ff8093a1 std +menu color timeout 1;37;40 #ffff8b00 #ff8093a1 std +menu color help 37;40 #ff1c2a33 #00000000 none +MENU MSGCOLOR #ff1c2a33 #00000000 none + diff --git a/boot-env/syslinux/vesamenu.c32 b/boot-env/syslinux/vesamenu.c32 new file mode 100755 index 00000000..d9884770 Binary files /dev/null and b/boot-env/syslinux/vesamenu.c32 differ diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index e125cd7e..c14046eb 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -107,8 +107,8 @@ I-script, so please look there if you'd like to know more. 'mirrors-to-try-count' => '20', 'mirrors-to-use-count' => '5', 'ossetup-max-try-count' => '5', + 'syslinux-theme' => 'openslx', 'pxe-passwd' => 'secret', - 'pxe-theme' => 'openslx', 'pxe-timeout' => '100', 'pxe-title' => 'Welcome to OpenSLX', 'pxe-totaltimeout' => '600', -- cgit v1.2.3-55-g7522