From f8dd196e594daf8f8de61b87b69cf3f1cf8ff7d9 Mon Sep 17 00:00:00 2001 From: Tomasz Rybak Date: Tue, 22 Apr 2014 18:21:46 +0200 Subject: [PATCH] Add missing unstable configuration fixing EC2 image building problems. --- bootstrapvz/common/tasks/apt.py | 6 +++--- bootstrapvz/common/tasks/network-configuration.json | 2 ++ bootstrapvz/providers/ec2/tasks/packages-kernels.json | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py index 3051f55..777f635 100644 --- a/bootstrapvz/common/tasks/apt.py +++ b/bootstrapvz/common/tasks/apt.py @@ -28,9 +28,9 @@ class AddDefaultSources(Task): sections = ' '.join(info.manifest.system['sections']) info.source_lists.add('main', 'deb {apt_mirror} {system.release} '+sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} '+sections) - info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections) - info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates '+sections) - if info.manifest.system['release'] not in {'testing', 'unstable'}: + if info.release_codename != 'sid': + info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections) + info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates '+sections) info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections) diff --git a/bootstrapvz/common/tasks/network-configuration.json b/bootstrapvz/common/tasks/network-configuration.json index 4e5dce7..2937384 100644 --- a/bootstrapvz/common/tasks/network-configuration.json +++ b/bootstrapvz/common/tasks/network-configuration.json @@ -8,5 +8,7 @@ "wheezy": ["auto eth0", "iface eth0 inet dhcp"], "jessie": ["auto eth0", + "iface eth0 inet dhcp"], +"sid": ["auto eth0", "iface eth0 inet dhcp"] } diff --git a/bootstrapvz/providers/ec2/tasks/packages-kernels.json b/bootstrapvz/providers/ec2/tasks/packages-kernels.json index 1e42622..adbbf97 100644 --- a/bootstrapvz/providers/ec2/tasks/packages-kernels.json +++ b/bootstrapvz/providers/ec2/tasks/packages-kernels.json @@ -7,6 +7,9 @@ {"i386": "linux-image-686", "amd64": "linux-image-amd64"}, "jessie": + {"i386": "linux-image-686", + "amd64": "linux-image-amd64"}, +"sid": {"i386": "linux-image-686", "amd64": "linux-image-amd64"} }