Merge pull request #762 from crawford/teeth

coreos-base/oem-rackspace-teeth: Move rename-interfaces.sh into script
This commit is contained in:
Alex Crawford 2014-07-21 18:29:29 -07:00
commit 8b8f235541
3 changed files with 9 additions and 2 deletions

View File

@ -47,8 +47,7 @@ coreos:
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/systemctl stop systemd-networkd
ExecStart=/usr/bin/bash -c "for dev in $(ip link show | gawk -F ':' '/^[0-9]+/ { print $2 }' | tr -d ' ' | sed 's/lo//'); do ip link set $dev down; done"
ExecStart=/usr/bin/bash -c "udevadm test /sys/class/net/*"
ExecStart=/usr/share/oem/bin/rename-interfaces.sh
ExecStart=/usr/bin/systemctl start systemd-networkd
- name: media-configdrive.mount
command: start

View File

@ -0,0 +1,7 @@
#! /bin/bash
INTERFACES=$(ip link show | gawk -F ':' '/^[0-9]+/ { print $2 }' | tr -d ' ' | sed 's/lo//')
for iface in ${INTERFACES}; do
ip link set ${iface} down
udevadm test /sys/class/net/${iface}
done

View File

@ -17,6 +17,7 @@ S="${WORKDIR}"
src_install() {
into "/usr/share/oem"
dobin ${FILESDIR}/netname.sh
dobin ${FILESDIR}/rename-interfaces.sh
insinto "/usr/share/oem"
doins ${FILESDIR}/cloud-config.yml