From 2b629d784c5306d6b8955fb6b94e5300688048d8 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Thu, 3 Mar 2016 13:59:01 -0800 Subject: [PATCH 1/3] Again fix the expand-root script for GCE. The volume is not /dev/loop0 but it should be /dev/sda. --- bootstrapvz/providers/gce/__init__.py | 1 + bootstrapvz/providers/gce/tasks/initd.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/bootstrapvz/providers/gce/__init__.py b/bootstrapvz/providers/gce/__init__.py index 6157bf6..895a33d 100644 --- a/bootstrapvz/providers/gce/__init__.py +++ b/bootstrapvz/providers/gce/__init__.py @@ -40,6 +40,7 @@ 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 1a98fca..57d305c 100644 --- a/bootstrapvz/providers/gce/tasks/initd.py +++ b/bootstrapvz/providers/gce/tasks/initd.py @@ -23,3 +23,15 @@ class AddGrowRootDisable(Task): 'etc/initramfs-tools/scripts/local-premount/gce-disable-growroot') copy(script_src, script_dst) os.chmod(script_dst, rwxr_xr_x) + + +class AdjustExpandRootDev(Task): + description = 'Adjusting the expand-root device' + phase = phases.system_modificatio + 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/loop0', '/dev/sda') From b590a02a8c160f1e0f8274172abccea3da98ae08 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Thu, 3 Mar 2016 14:14:54 -0800 Subject: [PATCH 2/3] Fix import. --- bootstrapvz/providers/gce/tasks/initd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrapvz/providers/gce/tasks/initd.py b/bootstrapvz/providers/gce/tasks/initd.py index 57d305c..903b623 100644 --- a/bootstrapvz/providers/gce/tasks/initd.py +++ b/bootstrapvz/providers/gce/tasks/initd.py @@ -1,6 +1,7 @@ from bootstrapvz.base import Task from bootstrapvz.common import phases from bootstrapvz.common.tasks import kernel +from bootstrapvz.common.tasks import initd from . import assets import os.path From d485ef681aee58edc09ea713b397448d4cb458c4 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Thu, 3 Mar 2016 14:29:42 -0800 Subject: [PATCH 3/3] Fix typo --- bootstrapvz/providers/gce/tasks/initd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrapvz/providers/gce/tasks/initd.py b/bootstrapvz/providers/gce/tasks/initd.py index 903b623..af7c9e8 100644 --- a/bootstrapvz/providers/gce/tasks/initd.py +++ b/bootstrapvz/providers/gce/tasks/initd.py @@ -28,7 +28,7 @@ class AddGrowRootDisable(Task): class AdjustExpandRootDev(Task): description = 'Adjusting the expand-root device' - phase = phases.system_modificatio + phase = phases.system_modification predecessors = [initd.AddExpandRoot, initd.AdjustExpandRootScript] @classmethod