From 7f9ee9d22c1e7dbad8834c82a1901c2d421ca8be Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Tue, 12 Jan 2016 19:12:57 +0000 Subject: [PATCH] Write Jessie growpart workaround script to something other than growpart In case growpart is installed. Sed this workaround path into the init.d script. Signed-off-by: Andrew Garrett --- bootstrapvz/common/assets/init.d/expand-root | 8 +++++--- bootstrapvz/common/tasks/initd.py | 2 ++ bootstrapvz/providers/ec2/tasks/packages.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bootstrapvz/common/assets/init.d/expand-root b/bootstrapvz/common/assets/init.d/expand-root index cf3053b..01cab4d 100644 --- a/bootstrapvz/common/assets/init.d/expand-root +++ b/bootstrapvz/common/assets/init.d/expand-root @@ -13,15 +13,17 @@ prog=$(basename $0) logger="logger -t $prog" -hash growpart 2> /dev/null || { - $logger "growpart was not found on PATH. Unable to expand size." +growpart="growpart" + +hash $growpart 2> /dev/null || { + $logger "$growpart was not found on PATH. Unable to expand size." exit 1 } root_device_path="/dev/xvda" root_index="0" -growpart $root_device_path $root_index || { +$growpart $root_device_path $root_index || { $logger "growpart failed. Unable to expand size." exit 1 } diff --git a/bootstrapvz/common/tasks/initd.py b/bootstrapvz/common/tasks/initd.py index 5ad65f6..43bf67d 100644 --- a/bootstrapvz/common/tasks/initd.py +++ b/bootstrapvz/common/tasks/initd.py @@ -66,3 +66,5 @@ class AdjustExpandRootScript(Task): root_device_path = 'root_device_path="{device}"'.format(device=info.volume.device_path) sed_i(script, '^root_device_path="/dev/xvda"$', root_device_path) + + sed_i(script, '^growpart="growpart"$', 'growpart-workaround') diff --git a/bootstrapvz/providers/ec2/tasks/packages.py b/bootstrapvz/providers/ec2/tasks/packages.py index 56f5b4c..4d51280 100644 --- a/bootstrapvz/providers/ec2/tasks/packages.py +++ b/bootstrapvz/providers/ec2/tasks/packages.py @@ -27,5 +27,5 @@ class AddWorkaroundGrowpart(Task): from shutil import copy from . import assets src = os.path.join(assets, 'bin/growpart') - dst = os.path.join(info.root, 'usr/bin/growpart') + dst = os.path.join(info.root, 'usr/bin/growpart-workaround') copy(src, dst)