Another convienence grouping of various patches.
This is the last 6 patches remaining in the pending branch at this time.
Once these 3 patch series are caught up, I'll move more from 3.0 into pending.
Brian Dolbec (6):
FIXME! Comment out a small code block causing TypeError.
Break out more repeated (path1 + path2)'s...
Rename a make.conf key to make_conf due to bash variable name
restrictions
reduce 2 operations into one simpler one
Extend ParserBase to do variable substitution.
Make shdir a complete path to ease it's use.
catalyst/base/stagebase.py | 45 ++++++++++++-----------
catalyst/config.py | 9 ++---
catalyst/defaults.py | 4 +-
catalyst/lock.py | 23 +++++++++---
catalyst/main.py | 6 ++-
etc/catalyst.conf | 8 +++-
targets/embedded/embedded-controller.sh | 22 +++++------
targets/grp/grp-controller.sh | 6 +--
targets/livecd-stage1/livecd-stage1-controller.sh | 4 +-
targets/livecd-stage2/livecd-stage2-controller.sh | 22 +++++------
targets/netboot/netboot-combine.sh | 6 +--
targets/netboot/netboot-controller.sh | 24 ++++++------
targets/netboot2/netboot2-controller.sh | 16 ++++----
targets/stage1/stage1-controller.sh | 8 ++--
targets/stage2/stage2-controller.sh | 6 +--
targets/stage3/stage3-controller.sh | 6 +--
targets/stage4/stage4-controller.sh | 22 +++++------
targets/support/bootloader-setup.sh | 6 +--
targets/support/create-iso.sh | 4 +-
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 +-
targets/support/target_image_setup.sh | 4 +-
targets/tinderbox/tinderbox-controller.sh | 6 +--
23 files changed, 142 insertions(+), 121 deletions(-)
--
2.1.0
