diff options
| author | Michael Janczyk | 2009-04-02 20:13:02 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2009-04-02 20:13:02 +0200 |
| commit | e5435e18a4cdaf121d4e3ade96831bcdb78c7577 (patch) | |
| tree | 57b575fd71c506dbaa723d7f971eceea6b67f798 | |
| parent | disputable realization of pxe-theme as default (diff) | |
| download | core-e5435e18a4cdaf121d4e3ade96831bcdb78c7577.tar.gz core-e5435e18a4cdaf121d4e3ade96831bcdb78c7577.tar.xz core-e5435e18a4cdaf121d4e3ade96831bcdb78c7577.zip | |
Makefile corrected and example include extended
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2795 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/PXE.pm | 2 | ||||
| -rw-r--r-- | boot-env/pxe/menu-include | 8 | ||||
| -rw-r--r-- | boot-env/pxe/menu-include.example | 23 |
4 files changed, 25 insertions, 10 deletions
@@ -195,7 +195,7 @@ plain-install: tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/; \ cp -pP tools/busybox{,.x86_64,.i586} \ $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/busybox/; \ - cp -p boot-env/pxe/menu-template.example \ + cp -p boot-env/pxe/menu-include.example \ $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/pxe/; \ cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \ tar --exclude=.svn -cp -C initramfs tpm | \ diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm index fb98e967..3b96796a 100644 --- a/boot-env/OpenSLX/BootEnvironment/PXE.pm +++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm @@ -205,7 +205,7 @@ sub _getTemplate } # include defaults - $pxeTemplate .= "\n# general configuration\n"; + $pxeTemplate .= "\n# static configuration\n"; $pxeTemplate .= "NOESCAPE 0\n"; $pxeTemplate .= "PROMPT 0\n"; diff --git a/boot-env/pxe/menu-include b/boot-env/pxe/menu-include deleted file mode 100644 index 490e9357..00000000 --- a/boot-env/pxe/menu-include +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/opt/openslx/boot-env/pxe/menu-include -# this include file will be loaded at the end and will overwrite existing defs -# for theme configuration use theme.conf in your theme directory -# general settings can be set via slxsettings - -# example german help: -# MENU PASSPROMPT Gesicherter Bereich, bitte Passwort eingeben: -# MENU AUTOBOOT Auswahl startet in # Sekunden diff --git a/boot-env/pxe/menu-include.example b/boot-env/pxe/menu-include.example new file mode 100644 index 00000000..5ae8db5c --- /dev/null +++ b/boot-env/pxe/menu-include.example @@ -0,0 +1,23 @@ +# this include file will be loaded at the end and 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 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 + |