diff options
author | Stefan Berg <stefan.k.berg@ericsson.com> | 2016-01-29 13:30:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-29 13:30:16 +0000 |
commit | e9316d44c551390327bb9661ad8d8ed10c28b3ae (patch) | |
tree | f8cea0faab0126558ff54addda64504f10a53a70 /deploy/fuel_patch | |
parent | a2a55ce8ab5e7b79d70f769a69370b7f1fb04fab (diff) | |
parent | e411b37291297105770229f06a95edcb3ff4be49 (diff) |
Merge "Uplift deployment code for Fuel 8.0" into stable/brahmaputra
Diffstat (limited to 'deploy/fuel_patch')
-rw-r--r-- | deploy/fuel_patch/ks.cfg.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/deploy/fuel_patch/ks.cfg.patch b/deploy/fuel_patch/ks.cfg.patch index 189695792..8c9cebc0f 100644 --- a/deploy/fuel_patch/ks.cfg.patch +++ b/deploy/fuel_patch/ks.cfg.patch @@ -1,19 +1,19 @@ -*** ks.cfg.orig Wed Apr 15 21:47:09 2015 ---- ks.cfg Wed Apr 15 21:47:24 2015 +*** ks.cfg.orig 2016-01-25 08:56:16.406241267 +0100 +--- ks.cfg 2016-01-25 14:31:11.417761494 +0100 *************** -*** 35,41 **** +*** 98,104 **** default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` - installdrive="undefined" -! forceformat="no" - for I in `cat /proc/cmdline`; do case "$I" in *=*) eval $I;; esac ; done - - set ${drives} ${removable_drives} ---- 35,41 ---- + installdrive=${installdrive:-undefined} +! forceformat=${forceformat:-no} + for I in $(cat /proc/cmdline); do + case "$I" in + *=*) +--- 98,104 ---- default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` - installdrive="undefined" -! forceformat="yes" - for I in `cat /proc/cmdline`; do case "$I" in *=*) eval $I;; esac ; done - - set ${drives} ${removable_drives} + installdrive=${installdrive:-undefined} +! forceformat=${forceformat:-yes} + for I in $(cat /proc/cmdline); do + case "$I" in + *=*) |