kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove virtio special case

Browse source 
Adding it later, once I figure out wth it is.
This commit is contained in:
Anders Ingemann 2013-08-11 19:46:18 +02:00
parent f0838cc77d
commit cecdeba45f
3 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/tasks/filesystem.py
View file

@ -122,8 +122,6 @@ class ModifyFstab(Task):
fstab_path = os.path.join(info.root, 'etc/fstab') fstab_path = os.path.join(info.root, 'etc/fstab')
device = '/dev/sda1' device = '/dev/sda1'
if info.manifest.virtualization == 'virtio':
device = '/dev/vda1'
if info.manifest.virtualization == 'pvm': if info.manifest.virtualization == 'pvm':
device = '/dev/xvda1' device = '/dev/xvda1'
with open(fstab_path, 'a') as fstab: with open(fstab_path, 'a') as fstab:

1
providers/virtualbox/manifest.py
View file

@ -10,6 +10,7 @@ class Manifest(base.Manifest):
def parse(self, data): def parse(self, data):
super(Manifest, self).parse(data) super(Manifest, self).parse(data)
self.virtualization = None
self.image = data['image'] self.image = data['image']
if 'loopback_dir' not in self.volume: if 'loopback_dir' not in self.volume:
self.volume['loopback_dir'] = '/tmp' self.volume['loopback_dir'] = '/tmp'

26
providers/virtualbox/tasks/boot.py
View file

@ -1,6 +1,5 @@
from base import Task from base import Task
from common import phases from common import phases
import os
class ConfigureGrub(Task): class ConfigureGrub(Task):
@ -8,32 +7,9 @@ class ConfigureGrub(Task):
phase = phases.system_modification phase = phases.system_modification
def run(self, info): def run(self, info):
import stat
rwxr_xr_x = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
stat.S_IRGRP | stat.S_IXGRP |
stat.S_IROTH | stat.S_IXOTH)
x_all = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
grubd = os.path.join(info.root, 'etc/grub.d')
for cfg in [os.path.join(grubd, f) for f in os.listdir(grubd)]:
os.chmod(cfg, os.stat(cfg).st_mode & ~ x_all)
from shutil import copy
script_src = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/grub.d/40_custom'))
script_dst = os.path.join(info.root, 'etc/grub.d/40_custom')
copy(script_src, script_dst)
os.chmod(script_dst, rwxr_xr_x)
if info.manifest.virtualization == 'virtio':
modules_path = os.path.join(info.root, 'etc/initramfs-tools/modules')
with open(modules_path, 'a') as modules:
modules.write("\nvirtio_pci\nvirtio_blk\n")
from common.tools import log_check_call from common.tools import log_check_call
log_check_call(['/usr/sbin/chroot', info.root, 'ln', '-s', '/boot/grub/grub.cfg', '/boot/grub/menu.lst'])
log_check_call(['/usr/sbin/chroot', info.root, 'update-initramfs', '-u']) log_check_call(['/usr/sbin/chroot', info.root, 'update-initramfs', '-u'])
log_check_call(['grub-install', log_check_call(['/usr/sbin/grub-install',
'--boot-directory='+info.root+"/boot/", '--boot-directory='+info.root+"/boot/",
info.bootstrap_device['path']]) info.bootstrap_device['path']])