diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-20 17:53:55 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-21 12:21:23 +0100 |
| commit | 35697966da656585c43e2a2342a135ada65703cb (patch) | |
| tree | f21fe4f673b9c35c9a9013b01e622e6d2d253965 /build/f_isoroot/f_kscfg | |
| parent | 0068505bab4bb8960594d4865a61fd3661bbe981 (diff) | |
Turn on fuelmenu by default, turn off biosdevname
Added experimental Fuel build loop, rebuilding up to ten times
while keeping the package cache, in the hope that all packages
will be able to download. Added snapshot support into this script
as well.
Changed naming of OPNFV iso label to OPNFV_FUEL_<id>, made changes
in ks.cfg and isolinux.cfg to look for this name at install.
Change-Id: Ic28a3af769cfc90416d7d988afd6f07eadcef4f1
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_isoroot/f_kscfg')
| -rw-r--r-- | build/f_isoroot/f_kscfg/Makefile | 6 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/ks.cfg | 6 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/ks.cfg.orig | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile index fe740418d..2a82a1803 100644 --- a/build/f_isoroot/f_kscfg/Makefile +++ b/build/f_isoroot/f_kscfg/Makefile @@ -13,12 +13,14 @@ TOP := $(shell pwd) .PHONY: all all: @mkdir -p release - @cp ks.cfg release + grep -q OpenStack_Fuel ks.cfg + sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg > ks.cfg.patched + @cp ks.cfg.patched release/ks.cfg @cp ks.cfg.orig release .PHONY: clean clean: - @rm -rf release + @rm -rf release ks.cfg.patched .PHONY: release release: all diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg index c09a09be9..1787db8c9 100644 --- a/build/f_isoroot/f_kscfg/ks.cfg +++ b/build/f_isoroot/f_kscfg/ks.cfg @@ -97,8 +97,8 @@ for drv in `ls -1 /sys/block | grep "sd\|hd\|vd\|cciss"`; do done default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` -installdrive="undefined" -forceformat="no" +installdrive=${installdrive:-undefined} +forceformat=${forceformat:-no} for I in $(cat /proc/cmdline); do case "$I" in *=*) @@ -628,4 +628,4 @@ if [[ ! -z $adminif ]]; then /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \ /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif} fi -%end
\ No newline at end of file +%end diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig index a752dacac..60e124ae3 100644 --- a/build/f_isoroot/f_kscfg/ks.cfg.orig +++ b/build/f_isoroot/f_kscfg/ks.cfg.orig @@ -97,8 +97,8 @@ for drv in `ls -1 /sys/block | grep "sd\|hd\|vd\|cciss"`; do done default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` -installdrive="undefined" -forceformat="no" +installdrive=${installdrive:-undefined} +forceformat=${forceformat:-no} for I in $(cat /proc/cmdline); do case "$I" in *=*) |