From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jun 2009 14:22:47 +0000 (+0200)
Subject: Changed pxe configuration.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13076afba5eb249257bf254de3ff800e97d2b861;p=ipfire-3.x.git

Changed pxe configuration.
---

diff --git a/config/bootloader/pxe.conf b/config/bootloader/pxe.conf
new file mode 100644
index 000000000..97d32df3a
--- /dev/null
+++ b/config/bootloader/pxe.conf
@@ -0,0 +1,30 @@
+
+DEFAULT @SNAME@/vesamenu.c32
+#prompt 1
+TIMEOUT 100
+
+DISPLAY @SNAME@/boot.msg
+F1 @SNAME@/boot.msg
+F2 @SNAME@/options.msg
+
+MENU BACKGROUND @SNAME@/splash.jpg
+MENU TITLE Welcome to @NAME@ @VERSION@!
+MENU COLOR border 0 #ffffffff #00000000
+MENU COLOR sel 7 #ffffffff #ff000000
+MENU COLOR title 0 #ffffffff #00000000
+MENU COLOR tabmsg 0 #ffffffff #00000000
+MENU COLOR unsel 0 #ffffffff #00000000
+MENU COLOR hotsel 0 #ff000000 #ffffffff
+MENU COLOR hotkey 7 #ffffffff #ff000000
+MENU hidden
+MENU hiddenrow 5
+
+LABEL install
+	MENU label ^Install a new @NAME@ system
+	MENU default
+	KERNEL @SNAME@/@SNAME@0
+	APPEND initrd=@SNAME@/initrd0 root=http://pxe.ipfire.org/@IMAGENAME@.iso rootfstype=iso9660 vga=791 splash mode=install quiet ro net=dhcp
+label rescue
+	MENU label ^Rescue installed @NAME@ system
+	KERNEL @SNAME@/@SNAME@0
+	APPEND initrd=@SNAME@/initrd0 root=http://pxe.ipfire.org/@IMAGENAME@.iso rootfstype=iso9660 vga=791 splash mode=rescue quiet ro net=dhcp
diff --git a/lfs/Config b/lfs/Config
index ad68ce35e..a7d348697 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -90,7 +90,8 @@ INSTALL_CONFIG = sed \
 	-e "s/@SNAME@/$(SNAME)/g" \
 	-e "s/@VERSION@/$(VERSION)/g" \
 	-e "s/@SLOGAN@/$(SLOGAN)/g" \
-	-e "s/@DATE@/$(shell date '+%Y%m%d')/g"
+	-e "s/@DATE@/$(shell date '+%Y%m%d')/g" \
+	-e "s/@IMAGENAME@/$(IMAGENAME)/g"
 
 INSTALL_INITSCRIPT = echo "Installing initscript \"$(INITSCRIPT)\" -> /etc/init.d"; \
 	install -m 754 $(DIR_SOURCE)/initscripts/extras/$(INITSCRIPT) /etc/init.d/
diff --git a/lfs/pxe b/lfs/pxe
index a7021efc3..8ced771f7 100644
--- a/lfs/pxe
+++ b/lfs/pxe
@@ -79,14 +79,7 @@ $(OBJECT): $(objects)
 		$(DIR_CONF)/bootloader/*.msg $(CDROM_DIR)/$(SNAME)/
 
 	cp -vf /usr/share/syslinux/pxelinux.0 $(CDROM_DIR)/
-	sed	-e "s/SNAME/$(SNAME)/g" \
-		-e "s/NAME/$(NAME)/g" \
-		-e "s/VERSION/$(VERSION)/g" \
-		-e "s@$(SNAME)0@$(SNAME)/$(SNAME)0@g" \
-		-e "s@initrd0@$(SNAME)/initrd0@g" \
-		-e "s@splash@$(SNAME)/splash@g" \
-		-e "s@vesamenu.c32@$(SNAME)/vesamenu.c32@g" \
-		$(DIR_CONF)/bootloader/installer.conf \
+	$(INSTALL_CONFIG) $(DIR_CONF)/bootloader/pxe.conf \
 		> $(CDROM_DIR)/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model
 
 	sed -e "s@splash@$(SNAME)/splash@g" \