diff options
Diffstat (limited to 'build/f_isoroot/f_isolinux')
| -rw-r--r-- | build/f_isoroot/f_isolinux/Makefile | 15 | ||||
| -rw-r--r-- | build/f_isoroot/f_isolinux/isolinux.cfg | 32 | ||||
| -rw-r--r-- | build/f_isoroot/f_isolinux/isolinux.cfg.orig | 32 |
3 files changed, 9 insertions, 70 deletions
diff --git a/build/f_isoroot/f_isolinux/Makefile b/build/f_isoroot/f_isolinux/Makefile index b683ea38c..f3e09b234 100644 --- a/build/f_isoroot/f_isolinux/Makefile +++ b/build/f_isoroot/f_isolinux/Makefile @@ -11,16 +11,19 @@ TOP := $(shell pwd) .PHONY: all -all: +all: isolinux.cfg.iso @mkdir -p release/isolinux - grep -q OpenStack_Fuel isolinux.cfg - sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg > isolinux.cfg.patched - @cp isolinux.cfg.patched release/isolinux/isolinux.cfg - @cp isolinux.cfg.orig release/isolinux/ + grep -q OpenStack_Fuel isolinux.cfg.iso + sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg.iso > isolinux.cfg + @cp isolinux.cfg release/isolinux/isolinux.cfg + @cp isolinux.cfg.iso release/isolinux/isolinux.cfg.orig + +isolinux.cfg.iso: + 7z -so x $(ISOCACHE) isolinux/isolinux.cfg > isolinux.cfg.iso .PHONY: clean clean: - @rm -rf release isolinux.cfg.patched + @rm -rf release isolinux.cfg.iso isolinux.cfg .PHONY: release release: all diff --git a/build/f_isoroot/f_isolinux/isolinux.cfg b/build/f_isoroot/f_isolinux/isolinux.cfg deleted file mode 100644 index 3e100134d..000000000 --- a/build/f_isoroot/f_isolinux/isolinux.cfg +++ /dev/null @@ -1,32 +0,0 @@ -default vesamenu.c32 -#prompt 1 -timeout 300 - -display boot.msg - -menu background splash.jpg -menu title Welcome to Fuel Installer (version: 8.0) -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 color scrollbar 0 #ffffffff #00000000 - -label nailgun - menu label ^1. Fuel Install (Static IP) - menu default - kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 selinux=0 showmenu=yes - -label nailgunifname - menu label ^2. Fuel Advanced Install (Static IP) - kernel vmlinuz - append initrd=initrd.img ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: dns1=10.20.0.1 selinux=0 ifname=adminif:XX:XX:XX:XX:XX:XX showmenu=yes - -label usbboot - menu label ^3. USB Fuel Install (Static IP) - kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes diff --git a/build/f_isoroot/f_isolinux/isolinux.cfg.orig b/build/f_isoroot/f_isolinux/isolinux.cfg.orig deleted file mode 100644 index c92ddd891..000000000 --- a/build/f_isoroot/f_isolinux/isolinux.cfg.orig +++ /dev/null @@ -1,32 +0,0 @@ -default vesamenu.c32 -#prompt 1 -timeout 300 - -display boot.msg - -menu background splash.jpg -menu title Welcome to Fuel Installer (version: 8.0) -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 color scrollbar 0 #ffffffff #00000000 - -label nailgun - menu label ^1. Fuel Install (Static IP) - menu default - kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 selinux=0 - -label nailgunifname - menu label ^2. Fuel Advanced Install (Static IP) - kernel vmlinuz - append initrd=initrd.img ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: dns1=10.20.0.1 selinux=0 ifname=adminif:XX:XX:XX:XX:XX:XX - -label usbboot - menu label ^3. USB Fuel Install (Static IP) - kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes |