ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source
This commit is contained in:
Andrew Hamilton 2017-07-23 19:30:25 +01:00
parent 0e68dd2e43
commit f583b66437
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test_distributions.py
View file

@ -21,7 +21,7 @@ def mount_squashfs_iso(iso, squashfs_path, mount_point):
cmd("mkdir iso && sudo mount -o loop %s iso" % iso)
cmd("mkdir lower && sudo mount -t squashfs iso/%s lower" % squashfs_path)
cmd("mkdir upper work %s && sudo mount -t overlay "
"-o lowerdir=lower,upperdir=upper,workdir=work overlay %s" %
"-o lowerdir=lower,upperdir=upper,workdir=work overlay %s" %
(mount_point, mount_point))
@ -35,14 +35,14 @@ def umount_squashfs_iso(mount_point):
def run_in_container(container, command):
option = "--directory" if os.path.isdir(container) else "--image"
cmd("sudo systemd-nspawn --quiet --chdir=/vigil --overlay=%s:/vigil "
'%s=%s /bin/bash --login -c "%s"' %
'%s=%s /bin/bash --login -c "%s"' %
(VIGIL_PATH, option, container, command))
def build_ubuntu():
cmd("sudo debootstrap zesty ubuntu.part")
run_in_container("ubuntu.part",
"ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
"ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
run_in_container("ubuntu.part",
"sed -i -e 's/main/main restricted universe"
" multiverse/g' /etc/apt/sources.list")
@ -60,7 +60,7 @@ def build_fedora():
def build_debian():
cmd("sudo debootstrap --components=main,contrib,non-free "
"--include=sudo jessie debian.part")
"--include=sudo jessie debian.part")
run_in_container("debian.part", "apt-get update")
os.rename("debian.part", "debian")
@ -82,7 +82,7 @@ def remove_archlinux():
os.remove(ARCHLINUX_ISO)
OPENSUSE_ISO="openSUSE-Tumbleweed-GNOME-Live-x86_64-Current.iso"
OPENSUSE_ISO = "openSUSE-Tumbleweed-GNOME-Live-x86_64-Current.iso"
def build_opensuse():