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
53 lines
1.5 KiB
Plaintext
53 lines
1.5 KiB
Plaintext
echo "starting network $BOOT_MAC_ADDRESS"
|
|
t=0
|
|
while ! BOOT_INTERFACE=$(find_interface "$BOOT_MAC_ADDRESS"); do
|
|
t=`expr "$t" + 5`
|
|
if [ "$t" -gt 10 ]; then
|
|
break
|
|
fi
|
|
sleep 5
|
|
done
|
|
if [ -z "$BOOT_INTERFACE" ]; then
|
|
err_msg "Could not find an interface that owns MAC: $BOOT_MAC_ADDRESS"
|
|
troubleshoot
|
|
fi
|
|
|
|
readonly BOOT_INTERFACE
|
|
|
|
ifconfig lo 127.0.0.1 up
|
|
rv=0
|
|
ifconfig "$BOOT_INTERFACE" up || rv=1
|
|
if [ $rv -ne 0 ]; then
|
|
sleep 10
|
|
rv=0
|
|
ifconfig "$BOOT_INTERFACE" up || rv=1
|
|
if [ $? -ne 0 ]; then
|
|
err_msg "Failed to ifconfig up $BOOT_INTERFACE"
|
|
troubleshoot
|
|
fi
|
|
fi
|
|
|
|
# Check if boot IP address was specific or retrieve from DHCP
|
|
if [ -n "$BOOT_IP_ADDRESS" ]; then
|
|
ifconfig "$BOOT_INTERFACE" "$BOOT_IP_ADDRESS" netmask "$BOOT_NETMASK"
|
|
route del default || true
|
|
route add default gw $BOOT_GATEWAY
|
|
else
|
|
dhclient -1 "$BOOT_INTERFACE"
|
|
if [[ $? == 2 ]]; then
|
|
echo "Error getting IP address for $BOOT_INTERFACE with MAC \
|
|
$BOOT_MAC_ADDRESS"
|
|
troubleshoot
|
|
fi
|
|
|
|
BOOT_IP_ADDRESS=$(ifconfig "$BOOT_INTERFACE" | grep 'inet addr:' | \
|
|
cut -d: -f2 | awk '{ print $1}')
|
|
BOOT_NETMASK=$(ifconfig "$BOOT_INTERFACE" | grep 'Mask:' | cut -d':' -f4)
|
|
BOOT_GATEWAY=$(route -n | grep "$BOOT_INTERFACE" | grep '^0.0.0.0' | \
|
|
awk '{print $2}')
|
|
echo "obtained the following from dhcp: "
|
|
echo " ip address = $BOOT_IP_ADDRESS"
|
|
echo " netmask = $BOOT_NETMASK"
|
|
echo " gateway = $BOOT_GATEWAY"
|
|
fi
|