From 6c03860eacfad9429e7d8ae435f39d3b01324295 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Wed, 2 Mar 2016 12:46:23 -0800 Subject: [PATCH 1/5] Fix GCE expand-root since commit/2ece5a66e1e36f30bef3a675e8287ab8c1bcc04f --- bootstrapvz/providers/gce/__init__.py | 1 - bootstrapvz/providers/gce/tasks/initd.py | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/bootstrapvz/providers/gce/__init__.py b/bootstrapvz/providers/gce/__init__.py index 895a33d..6157bf6 100644 --- a/bootstrapvz/providers/gce/__init__.py +++ b/bootstrapvz/providers/gce/__init__.py @@ -40,7 +40,6 @@ def resolve_tasks(taskset, manifest): tasks.host.InstallHostnameHook, tasks.boot.ConfigureGrub, initd.AddExpandRoot, - tasks.initd.AdjustExpandRootDev, initd.InstallInitScripts, boot.BlackListModules, boot.UpdateInitramfs, diff --git a/bootstrapvz/providers/gce/tasks/initd.py b/bootstrapvz/providers/gce/tasks/initd.py index f2b20bc..bcc30c7 100644 --- a/bootstrapvz/providers/gce/tasks/initd.py +++ b/bootstrapvz/providers/gce/tasks/initd.py @@ -6,18 +6,6 @@ from . import assets import os.path -class AdjustExpandRootDev(Task): - description = 'Adjusting the expand-root device' - phase = phases.system_modification - predecessors = [initd.AddExpandRoot, initd.AdjustExpandRootScript] - - @classmethod - def run(cls, info): - from bootstrapvz.common.tools import sed_i - script = os.path.join(info.root, 'etc/init.d/expand-root') - sed_i(script, '/dev/xvda', '/dev/sda') - - class AddGrowRootDisable(Task): description = 'Add script to selectively disable growroot' phase = phases.system_modification From 3f208b985fa6521dd90c1f77846390a2330f6b1d Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Wed, 2 Mar 2016 16:19:57 -0800 Subject: [PATCH 2/5] Move hack for growpart to its own task. --- bootstrapvz/common/tasks/initd.py | 12 +++++++++++- bootstrapvz/providers/ec2/__init__.py | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bootstrapvz/common/tasks/initd.py b/bootstrapvz/common/tasks/initd.py index f4537e3..a68a944 100644 --- a/bootstrapvz/common/tasks/initd.py +++ b/bootstrapvz/common/tasks/initd.py @@ -58,7 +58,6 @@ class AdjustExpandRootScript(Task): @classmethod def run(cls, info): from ..tools import sed_i - from bootstrapvz.common.releases import jessie script = os.path.join(info.root, 'etc/init.d/expand-root') root_idx = info.volume.partition_map.root.get_index() @@ -68,5 +67,16 @@ 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) + +class AdjustGrowpartWorkaround(Task): + description = 'Adjusting expand-root for growpart-workaround' + phase = phases.system_modification + predecessors = [AdjustExpandRootScript] + + @classmethod + def run(cls, info): + from ..tools import sed_i + from bootstrapvz.common.releases import jessie + if info.manifest.release >= jessie: sed_i(script, '^growpart="growpart"$', 'growpart-workaround') diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 21749c6..5ea09d0 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -89,6 +89,7 @@ def resolve_tasks(taskset, manifest): if manifest.volume['partitions']['type'] != 'none': taskset.add(initd.AdjustExpandRootScript) + taskset.add(initd.AdjustGrowpartWorkaround) if manifest.system['bootloader'] == 'pvgrub': taskset.add(grub.AddGrubPackage) From 31a98badcbac18b2e5d22260a962ecb5da3641e4 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Wed, 2 Mar 2016 16:28:11 -0800 Subject: [PATCH 3/5] Fix unused import. --- bootstrapvz/providers/gce/tasks/initd.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrapvz/providers/gce/tasks/initd.py b/bootstrapvz/providers/gce/tasks/initd.py index bcc30c7..1a98fca 100644 --- a/bootstrapvz/providers/gce/tasks/initd.py +++ b/bootstrapvz/providers/gce/tasks/initd.py @@ -1,6 +1,5 @@ from bootstrapvz.base import Task from bootstrapvz.common import phases -from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import kernel from . import assets import os.path From ee12a3e3407ee65b3f4d4359ce04b75bca265f53 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Wed, 2 Mar 2016 16:30:53 -0800 Subject: [PATCH 4/5] Fix missing script line. --- bootstrapvz/common/tasks/initd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrapvz/common/tasks/initd.py b/bootstrapvz/common/tasks/initd.py index a68a944..3de5c17 100644 --- a/bootstrapvz/common/tasks/initd.py +++ b/bootstrapvz/common/tasks/initd.py @@ -78,5 +78,7 @@ class AdjustGrowpartWorkaround(Task): from ..tools import sed_i from bootstrapvz.common.releases import jessie + script = os.path.join(info.root, 'etc/init.d/expand-root') + if info.manifest.release >= jessie: sed_i(script, '^growpart="growpart"$', 'growpart-workaround') From 108fa9547e721625a1236e5e49c97ed500bcb96d Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Thu, 3 Mar 2016 10:14:02 -0800 Subject: [PATCH 5/5] Move the >=jessie workaround out of the common task. --- bootstrapvz/common/tasks/initd.py | 6 +----- bootstrapvz/providers/ec2/__init__.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bootstrapvz/common/tasks/initd.py b/bootstrapvz/common/tasks/initd.py index 3de5c17..4669b03 100644 --- a/bootstrapvz/common/tasks/initd.py +++ b/bootstrapvz/common/tasks/initd.py @@ -76,9 +76,5 @@ class AdjustGrowpartWorkaround(Task): @classmethod def run(cls, info): from ..tools import sed_i - from bootstrapvz.common.releases import jessie - script = os.path.join(info.root, 'etc/init.d/expand-root') - - if info.manifest.release >= jessie: - sed_i(script, '^growpart="growpart"$', 'growpart-workaround') + sed_i(script, '^growpart="growpart"$', 'growpart-workaround') diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 5ea09d0..5fb2cee 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -83,13 +83,13 @@ def resolve_tasks(taskset, manifest): if manifest.release >= jessie: taskset.add(tasks.packages.AddWorkaroundGrowpart) + taskset.add(initd.AdjustGrowpartWorkaround) if manifest.provider.get('install_init_scripts', True): taskset.add(tasks.initd.AddEC2InitScripts) if manifest.volume['partitions']['type'] != 'none': taskset.add(initd.AdjustExpandRootScript) - taskset.add(initd.AdjustGrowpartWorkaround) if manifest.system['bootloader'] == 'pvgrub': taskset.add(grub.AddGrubPackage)