summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/pxemenu.template12
-rw-r--r--src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java7
2 files changed, 6 insertions, 13 deletions
diff --git a/data/pxemenu.template b/data/pxemenu.template
index 2fcc88e..11e3535 100644
--- a/data/pxemenu.template
+++ b/data/pxemenu.template
@@ -54,9 +54,9 @@ LABEL shutdown
LABEL net
MENU LABEL ^bwLehrpool-Umgebung starten
- KERNEL http://%ip%/boot/default/kernel
- INITRD http://%ip%/boot/default/initramfs-stage31
- APPEND slxsrv=%ip% slxbase=boot/default vga=current quiet splash
+ KERNEL http://IPADDR/boot/default/kernel
+ INITRD http://IPADDR/boot/default/initramfs-stage31
+ APPEND slxbase=boot/default vga=current quiet splash
IPAPPEND 3
%default-net%
@@ -69,9 +69,9 @@ LABEL hdd
LABEL openslx-debug
MENU LABEL ^bwLehrpool-Umgebung starten (nosplash, debug)
- KERNEL http://%ip%/boot/default/kernel
- INITRD http://%ip%/boot/default/initramfs-stage31
- APPEND slxsrv=%ip% slxbase=boot/default
+ KERNEL http://IPADDR/boot/default/kernel
+ INITRD http://IPADDR/boot/default/initramfs-stage31
+ APPEND slxbase=boot/default
IPAPPEND 3
%custom%
diff --git a/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java b/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java
index c0534c7..741c71e 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java
@@ -13,8 +13,6 @@ public class CompileIPxe extends AbstractTask
{
@Expose
- private String ip = null;
- @Expose
private String defaultentry = null;
@Expose
private int timeout = 0;
@@ -27,10 +25,6 @@ public class CompileIPxe extends AbstractTask
protected boolean initTask()
{
this.setStatusObject( this.status );
- if ( this.ip == null ) {
- status.error = "No IP address set.";
- return false;
- }
if ( this.defaultentry == null )
this.defaultentry = "net";
if ( this.custom == null )
@@ -50,7 +44,6 @@ public class CompileIPxe extends AbstractTask
return false;
}
// Substitutions
- template = template.replaceAll( "%ip%", this.ip );
template = template.replaceAll( "%timeout%", Integer.toString( this.timeout * 10 ) );
template = template.replaceAll( "%totaltimeout%", Integer.toString( this.timeout * 40 ) );
template = template.replaceAll( "%default%", this.defaultentry );