sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add dhcp support for ramdisk element."

Browse Source
This commit is contained in:
Jenkins 2014-07-18 12:23:45 +00:00 committed by Gerrit Code Review
commit fc5e791a6b
6 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/ramdisk/binary-deps.d/ramdisk Normal file
View File

@ -0,0 +1 @@
dhclient

1
elements/ramdisk/element-deps Normal file
View File

@ -0,0 +1 @@
pkg-map

8
elements/ramdisk/extra-data.d/scripts/init
View File

@ -34,10 +34,12 @@ mount -t proc proc /proc
readonly _BOOTIF_=$(get_kernel_parameter BOOTIF) readonly _BOOTIF_=$(get_kernel_parameter BOOTIF)
readonly _IP_=$(get_kernel_parameter ip) readonly _IP_=$(get_kernel_parameter ip)
readonly BOOT_MAC_ADDRESS=$(echo "$_BOOTIF_" | sed -e "s/-/:/g" | sed -e "s/^01://g" | tr 'a-f' 'A-F') readonly BOOT_MAC_ADDRESS=$(echo "$_BOOTIF_" | sed -e "s/-/:/g" | sed -e "s/^01://g" | tr 'a-f' 'A-F')
readonly BOOT_IP_ADDRESS=$(echo "$_IP_" | cut -d':' -f1)
readonly BOOT_SERVER=$(echo "$_IP_" | cut -d':' -f2) readonly BOOT_SERVER=$(echo "$_IP_" | cut -d':' -f2)
readonly BOOT_NETMASK=$(echo "$_IP_" | cut -d':' -f4)
readonly BOOT_GATEWAY=$(echo "$_IP_" | cut -d':' -f3) # IP address and other parameters may be set later in the init script
BOOT_IP_ADDRESS=$(echo "$_IP_" | cut -d':' -f1)
BOOT_NETMASK=$(echo "$_IP_" | cut -d':' -f4)
BOOT_GATEWAY=$(echo "$_IP_" | cut -d':' -f3)
readonly DISK=$(get_kernel_parameter disk) readonly DISK=$(get_kernel_parameter disk)

35
elements/ramdisk/init.d/02-start-network
View File

@ -26,20 +26,35 @@ if [ $rv -ne 0 ]; then
troubleshoot troubleshoot
fi fi
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" ifconfig "$BOOT_INTERFACE" "$BOOT_IP_ADDRESS" netmask "$BOOT_NETMASK"
route del default || true route del default || true
route add default gw $BOOT_GATEWAY route add default gw $BOOT_GATEWAY
else
echo "pinging to boot server $BOOT_SERVER" dhclient -1 "$BOOT_INTERFACE"
w=30 if [[ $? == 2 ]]; then
while [ $w -gt 0 ]; do echo "Error getting IP address for $BOOT_INTERFACE with MAC \
ping -c 5 -q "$BOOT_SERVER" > /dev/null $BOOT_MAC_ADDRESS"
if [ $? -eq 0 ]; then troubleshoot
break 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
if [ -n "$BOOT_SERVER" ]; then
echo "pinging to boot server $BOOT_SERVER"
wait_for 6 1 ping -c 5 -q "$BOOT_SERVER" > /dev/null
fi fi
sleep 1
w=`expr $w - 5`
done
echo "network ready" echo "network ready"

5
elements/ramdisk/install.d/20-install-dhcp-client
View File

@ -2,6 +2,5 @@
set -eux set -eux
set -o pipefail set -o pipefail
if [ "opensuse" = "$DISTRO_NAME" ]; then DHCP_CLIENT=$(pkg-map --element ramdisk dhcp_client)
install-packages dhcp-client install-packages $DHCP_CLIENT
fi

10
elements/ramdisk/pkg-map Normal file
View File

@ -0,0 +1,10 @@
{
"family":{
"debian":{
"dhcp_client":"isc-dhcp-client"
}
},
"default":{
"dhcp_client":"dhclient"
}
}