Add missing unstable configuration fixing EC2 image building problems.

This commit is contained in:
Tomasz Rybak 2014-04-22 18:21:46 +02:00
parent 1781eef692
commit f8dd196e59
3 changed files with 8 additions and 3 deletions

View file

@ -28,9 +28,9 @@ class AddDefaultSources(Task):
sections = ' '.join(info.manifest.system['sections']) sections = ' '.join(info.manifest.system['sections'])
info.source_lists.add('main', 'deb {apt_mirror} {system.release} '+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-src {apt_mirror} {system.release} '+sections)
info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections) if info.release_codename != 'sid':
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates '+sections) info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections)
if info.manifest.system['release'] not in {'testing', 'unstable'}: 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 {apt_mirror} {system.release}-updates ' + sections)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections)

View file

@ -8,5 +8,7 @@
"wheezy": ["auto eth0", "wheezy": ["auto eth0",
"iface eth0 inet dhcp"], "iface eth0 inet dhcp"],
"jessie": ["auto eth0", "jessie": ["auto eth0",
"iface eth0 inet dhcp"],
"sid": ["auto eth0",
"iface eth0 inet dhcp"] "iface eth0 inet dhcp"]
} }

View file

@ -7,6 +7,9 @@
{"i386": "linux-image-686", {"i386": "linux-image-686",
"amd64": "linux-image-amd64"}, "amd64": "linux-image-amd64"},
"jessie": "jessie":
{"i386": "linux-image-686",
"amd64": "linux-image-amd64"},
"sid":
{"i386": "linux-image-686", {"i386": "linux-image-686",
"amd64": "linux-image-amd64"} "amd64": "linux-image-amd64"}
} }