diff --git a/debian-isogen/files/build.sh b/debian-isogen/files/build.sh index 2ea325a..ffda0d7 100644 --- a/debian-isogen/files/build.sh +++ b/debian-isogen/files/build.sh @@ -25,6 +25,8 @@ _debootstrap chroot "${CHROOT}" < "${BASEDIR}/packages_install.sh" +_use_ubuntu_net_device_names + mkdir -p "${CLOUD_DATA_LATEST}" cp "${BASEDIR}/meta_data.json" "${CLOUD_DATA_LATEST}" cp "${USER_DATA}" "${CLOUD_DATA_LATEST}/user_data" diff --git a/debian-isogen/files/functions.sh b/debian-isogen/files/functions.sh index bc5270f..c5a0b47 100644 --- a/debian-isogen/files/functions.sh +++ b/debian-isogen/files/functions.sh @@ -23,6 +23,16 @@ function _debootstrap (){ http://ftp.debian.org/debian/ } +function _use_ubuntu_net_device_names (){ +# this prioritizes the path policy over slot +# giving ubuntu compatible interface names + cat <"${HOME}"/LIVE_BOOT/chroot/usr/lib/systemd/network/99-default.link +[Link] +NamePolicy=kernel database onboard path slot +MACAddressPolicy=persistent +EOF +} + function _make_kernel(){ mkdir -p "${HOME}"/LIVE_BOOT/{scratch,image/live} mksquashfs \ diff --git a/debian-isogen/files/packages_install.sh b/debian-isogen/files/packages_install.sh index 5d1e77d..20a0d02 100644 --- a/debian-isogen/files/packages_install.sh +++ b/debian-isogen/files/packages_install.sh @@ -24,9 +24,22 @@ apt-get update && apt-get install -y --no-install-recommends \ openssh-server \ curl \ gnupg \ - iptables + iptables \ + ifenslave \ + bridge-utils \ + tcpdump \ + iputils-ping \ + vlan UNSTABLE_REPO="deb http://ftp.debian.org/debian unstable main" echo "${UNSTABLE_REPO}" >> /etc/apt/sources.list.d/unstable.list + +# ensure we support bonding and 802.1q + +echo 'bonding' >> /etc/modules +echo '8021q' >> /etc/modules + apt-get update && apt-get install -y --no-install-recommends \ cloud-init rm -rf /etc/apt/sources.list.d/unstable.list /var/lib/apt/lists/* + +