97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
107 lines
2.6 KiB
Bash
Executable File
107 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
INTERFACE=${1:-} #optional, if not specified configure all available interfaces
|
|
ENI_FILE="/etc/network/interfaces"
|
|
|
|
PATH=/sbin:$PATH
|
|
|
|
if [ -d "/etc/network" ]; then
|
|
CONF_TYPE="eni"
|
|
elif [ -d "/etc/sysconfig/network-scripts/" ]; then
|
|
CONF_TYPE="netscripts"
|
|
else
|
|
echo "Unsupported network configuration type!"
|
|
exit 1
|
|
fi
|
|
|
|
ARGS="$0 $@"
|
|
|
|
function serialize_me() {
|
|
if [ "$CONF_TYPE" == "eni" ]; then
|
|
# Serialize runs so that we don't miss hot-add interfaces
|
|
FLOCKED=${FLOCKED:-}
|
|
if [ -z "$FLOCKED" ] ; then
|
|
FLOCKED=true exec flock -x $ENI_FILE $ARGS
|
|
fi
|
|
fi
|
|
}
|
|
|
|
function get_if_link() {
|
|
cat /sys/class/net/${1}/carrier
|
|
}
|
|
|
|
function enable_interface() {
|
|
local interface=$1
|
|
|
|
serialize_me
|
|
if [ "$CONF_TYPE" == "eni" ]; then
|
|
printf "auto $interface\niface $interface inet dhcp\n\n" >>$ENI_FILE
|
|
elif [ "$CONF_TYPE" == "netscripts" ]; then
|
|
printf "DEVICE=\"$interface\"\nBOOTPROTO=\"dhcp\"\nONBOOT=\"yes\"\nTYPE=\"Ethernet\"" >"/etc/sysconfig/network-scripts/ifcfg-$interface"
|
|
fi
|
|
echo "Configured $1"
|
|
|
|
}
|
|
|
|
function config_exists() {
|
|
local interface=$1
|
|
if [ "$CONF_TYPE" == "netscripts" ]; then
|
|
if [ -f "/etc/sysconfig/network-scripts/ifcfg-$interface" ]; then
|
|
return 0
|
|
fi
|
|
else
|
|
if ifquery $interface >/dev/null 2>&1; then
|
|
if [ -z "$(ifquery $interface 2>&1)" ]; then
|
|
return 1
|
|
else
|
|
return 0
|
|
fi
|
|
else
|
|
return 1
|
|
fi
|
|
fi
|
|
return 1
|
|
}
|
|
|
|
function inspect_interface() {
|
|
local interface=$1
|
|
local mac_addr_type
|
|
mac_addr_type=$(cat /sys/class/net/${interface}/addr_assign_type)
|
|
|
|
echo -n "Inspecting interface: $interface..."
|
|
if config_exists $interface; then
|
|
echo "Has config, skipping."
|
|
elif [ "$mac_addr_type" != "0" ]; then
|
|
echo "Device has generated MAC, skipping."
|
|
else
|
|
ip link set dev $interface up &>/dev/null
|
|
|
|
local has_link
|
|
local tries
|
|
for ((tries = 0; tries < 20; tries++)); do
|
|
has_link=$(get_if_link $interface)
|
|
[ "$has_link" == "1" ] && break
|
|
sleep 1
|
|
done
|
|
if [ "$has_link" == "1" ]; then
|
|
enable_interface "$interface"
|
|
else
|
|
echo "No link detected, skipping"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
if [ -n "$INTERFACE" ]; then
|
|
inspect_interface $INTERFACE
|
|
else
|
|
for iface in $(ls /sys/class/net | grep -v ^lo$); do
|
|
inspect_interface $iface
|
|
done
|
|
fi
|