Merge "Fix wrong package names or versions for centos-minimal images"
This commit is contained in:
commit
6053c4baeb
|
@ -2,6 +2,7 @@
|
||||||
"release": {
|
"release": {
|
||||||
"rhel": {
|
"rhel": {
|
||||||
"8": {
|
"8": {
|
||||||
|
"isc-dhcp-client": "dhcp-client",
|
||||||
"python-dev": "platform-python-devel",
|
"python-dev": "platform-python-devel",
|
||||||
"vlan": "",
|
"vlan": "",
|
||||||
"screen": "",
|
"screen": "",
|
||||||
|
@ -20,7 +21,7 @@
|
||||||
"cloud-guest-utils": "",
|
"cloud-guest-utils": "",
|
||||||
"apparmor": "",
|
"apparmor": "",
|
||||||
"dmeventd": "",
|
"dmeventd": "",
|
||||||
"isc-dhcp-client": "dhcp-client",
|
"isc-dhcp-client": "dhclient",
|
||||||
"uuid-runtime": "",
|
"uuid-runtime": "",
|
||||||
"ubuntu-cloudimage-keyring": "",
|
"ubuntu-cloudimage-keyring": "",
|
||||||
"vim-tiny": "",
|
"vim-tiny": "",
|
||||||
|
|
|
@ -4,14 +4,16 @@
|
||||||
"trusty": {
|
"trusty": {
|
||||||
"haproxy": "haproxy/trusty-backports"
|
"haproxy": "haproxy/trusty-backports"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"centos": {
|
||||||
|
"7": {
|
||||||
|
"haproxy": "haproxy18"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"distro": {
|
"distro": {
|
||||||
"ubuntu": {
|
"ubuntu": {
|
||||||
"haproxy": "haproxy"
|
"haproxy": "haproxy"
|
||||||
},
|
|
||||||
"centos7": {
|
|
||||||
"haproxy": "haproxy18"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"family": {
|
"family": {
|
||||||
|
|
|
@ -6,7 +6,7 @@ set -o xtrace
|
||||||
|
|
||||||
if [ "$DISTRO_NAME" == "ubuntu" ] && [ "$DIB_RELEASE" == "trusty" ]; then
|
if [ "$DISTRO_NAME" == "ubuntu" ] && [ "$DIB_RELEASE" == "trusty" ]; then
|
||||||
echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list
|
echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list
|
||||||
elif [ "$DISTRO_NAME" == "centos7" ]; then
|
elif [ "$DISTRO_NAME" == "centos" ] && [ "$DIB_RELEASE" == "7" ]; then
|
||||||
INCLUDEPKGS=''
|
INCLUDEPKGS=''
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64|amd64)
|
x86_64|amd64)
|
||||||
|
|
Loading…
Reference in New Issue