X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=f224e9f7c96b5fc24e24868ad190b7f05da861f0;hb=ce6c06ce733acf2a62c4721c3d5e3864b3d8ad43;hp=0b09cf7f4693d468eb6acd5df1d4ba9186ba0494;hpb=d030fcfca2ed36c49ce41c2539a1a279bc13142d;p=build.git diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 0b09cf7f..f224e9f7 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -10,7 +10,7 @@ COMMAND=$(basename $0) DIRNAME=$(dirname $0) BUILD_DIR=$(pwd) -# pkgs parsing utilities +# pkgs parsing utilities + lbuild-bridge.sh export PATH=$(dirname $0):$PATH # old guests have e.g. mount in /bin but this is no longer part of @@ -22,6 +22,7 @@ export PATH=$PATH:/bin:/sbin DEFAULT_FCDISTRO=f20 DEFAULT_PLDISTRO=lxc DEFAULT_PERSONALITY=linux64 +DEFAULT_MEMORY=512 ########## # constant @@ -34,32 +35,7 @@ VIF_GUEST=eth0 FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients" DEBIAN_PREINSTALLED="openssh-server openssh-client" -############################## -## stolen from tests/system/template-qemu/qemu-bridge-init -# use /proc/net/dev instead of a hard-wired list -function gather_interfaces () { - python < /dev/null @@ -87,92 +63,6 @@ print ".".join([ str(256-2**(8-i)) for i in result ]) EOF } -#################### bridge initialization -function create_bridge_if_needed() { - - # turn on verbosity - set -x - - # already created ? - we're done - ip addr show $PUBLIC_BRIDGE >& /dev/null && { - echo "Bridge already set up - skipping create_bridge_if_needed" - return 0 - } - - # find out the physical interface to bridge onto - if_lan=$(discover_interface) - - ip addr show $if_lan &>/dev/null || { - echo "Cannot use interface $if_lan - exiting" - exit 1 - } - - #################### bride initialization - check_yum_installed bridge-utils - - echo "========== $COMMAND: entering create_bridge - beg" - hostname - uname -a - ip addr show - ip route - echo "========== $COMMAND: entering create_bridge - end" - - # disable netfilter calls for bridge interface (they cause panick on 2.6.35 anyway) - # - # another option would be to accept the all forward packages for - # bridged interface like: -A FORWARD -m physdev --physdev-is-bridged -j ACCEPT - sysctl net.bridge.bridge-nf-call-iptables=0 - sysctl net.bridge.bridge-nf-call-ip6tables=0 - sysctl net.bridge.bridge-nf-call-arptables=0 - - - #Getting host IP/masklen - address=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $2;}') - [ -z "$address" ] && { echo "ERROR: Could not determine IP address for $if_lan" ; exit 1 ; } - - broadcast=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $4;}') - [ -z "$broadcast" ] && echo "WARNING: Could not determine broadcast address for $if_lan" - - gateway=$(ip route show | grep default | awk '{print $3;}') - [ -z "$gateway" ] && echo "WARNING: Could not determine gateway IP" - - - # creating the bridge - echo "Creating bridge PUBLIC_BRIDGE=$PUBLIC_BRIDGE" - brctl addbr $PUBLIC_BRIDGE - brctl addif $PUBLIC_BRIDGE $if_lan - echo "Activating promiscuous mode if_lan=$if_lan" - ip link set $if_lan up promisc on - sleep 2 - # rely on dhcp to re assign IP.. - echo "Starting dhclient on $PUBLIC_BRIDGE" - dhclient $PUBLIC_BRIDGE - sleep 1 - - #Reconfigure the routing table - echo "Configuring gateway=$gateway" - ip route add default via $gateway dev $PUBLIC_BRIDGE - ip route del default via $gateway dev $if_lan - # at this point we have an extra route like e.g. - ## ip route show - #default via 138.96.112.250 dev br0 - #138.96.112.0/21 dev em1 proto kernel scope link src 138.96.112.57 - #138.96.112.0/21 dev br0 proto kernel scope link src 138.96.112.57 - #192.168.122.0/24 dev virbr0 proto kernel scope link src 192.168.122.1 - route_dest=$(ip route show | grep -v default | grep "dev $PUBLIC_BRIDGE" | awk '{print $1;}') - ip route del $route_dest dev $if_lan - - echo "========== $COMMAND: exiting create_bridge - beg" - ip addr show - ip route show - echo "========== $COMMAND: exiting create_bridge - end" - - # for safety - sleep 3 - return 0 - -} - ############################## # return yum or debootstrap function package_method () { @@ -207,31 +97,20 @@ function almost_empty () { count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; } -############################## -function check_yum_installed () { - package=$1; shift - rpm -q $package >& /dev/null || yum -y install $package -} - -function check_yumgroup_installed () { - group="$1"; shift - yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; } -} - ############################## function fedora_install() { set -x set -e cache=/var/cache/lxc/fedora/$arch/$release + mkdir -p $cache - mkdir -p /var/lock/subsys/ ( - flock -n -x 200 || { echo "Cache repository is busy." ; return 1 ; } + flock --exclusive --timeout 60 200 || { echo "Cache repository is busy." ; return 1 ; } if [ ! -e "$cache/rootfs" ]; then echo "Getting cache download in $cache/rootfs ... " - fedora_download || { echo "Failed to download 'fedora base'"; return 1; } + fedora_download $cache || { echo "Failed to download 'fedora base'"; return 1; } else echo "Updating cache $cache/rootfs ..." if ! yum --installroot $cache/rootfs -y --nogpgcheck update ; then @@ -241,18 +120,21 @@ function fedora_install() { fi fi - echo "Copy $cache/rootfs to $lxc_root ... " + echo "Filling $lxc_root from $cache/rootfs ... " rsync -a $cache/rootfs/ $lxc_root/ return 0 - ) 200>/var/lock/subsys/lxc + ) 200> $cache/lock return $? } function fedora_download() { set -x + + cache=$1; shift + # check the mini fedora was not already downloaded INSTALL_ROOT=$cache/partial echo $INSTALL_ROOT @@ -562,7 +444,7 @@ function setup_lxc() { esac # Enable cgroup -- xxx -- is this really useful ? - mkdir $lxc_root/cgroup + [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup # set up resolv.conf cp /etc/resolv.conf $lxc_root/etc/resolv.conf @@ -590,7 +472,7 @@ function write_lxc_xml_test () { cat < $lxc - 524288 + $MEMORY exe /sbin/init @@ -629,7 +511,7 @@ function write_lxc_xml_build () { cat < $lxc - 524288 + $MEMORY exe /sbin/init @@ -865,6 +747,7 @@ function usage () { echo " -P pkgs_file - defines a set of extra packages to install in guest" echo " by default we use devel.pkgs (build mode) or runtime.pkgs (test mode)" echo " -i image - the location of the rootfs" + echo " -m memory - the amount of allocated memory in MB - defaults to $DEFAULT_MEMORY MB" echo " -v be verbose" exit 1 } @@ -880,7 +763,7 @@ function main () { exit 1 fi - while getopts "n:f:d:p:r:P:i:v" opt ; do + while getopts "n:f:d:p:r:P:i:m:v" opt ; do case $opt in n) GUEST_HOSTNAME=$OPTARG;; f) fcdistro=$OPTARG;; @@ -889,6 +772,7 @@ function main () { r) REPO_URL=$OPTARG;; P) PREINSTALLED=$OPTARG;; i) IMAGE=$OPTARG;; + m) MEMORY=$OPTARG;; v) VERBOSE=true; set -x;; *) usage ;; esac @@ -926,9 +810,13 @@ function main () { [ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY + [ -z "$MEMORY" ] && MEMORY=$DEFAULT_MEMORY + + # set memory in KB + MEMORY=$(($MEMORY * 1024)) # the set of preinstalled packages - depends on mode - if [ -z "$PREINSTALLED"] ; then + if [ -z "$PREINSTALLED" ] ; then if [ -n "$BUILD_MODE" ] ; then PREINSTALLED=devel.pkgs else @@ -967,14 +855,15 @@ function main () { # (build mode relies entirely on dhcp on the private subnet) if [ -z "$BUILD_MODE" ] ; then - create_bridge_if_needed + #create_bridge_if_needed $PUBLIC_BRIDGE + lbuild-bridge.sh $PUBLIC_BRIDGE GUEST_IP=$(gethostbyname $GUEST_HOSTNAME) # use same NETMASK as bridge interface br0 - MASKLEN=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2) - NETMASK=$(masklen_to_netmask $MASKLEN) + masklen=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2) + NETMASK=$(masklen_to_netmask $masklen) GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1) - VIF_HOST="i$(echo $GUEST_HOSTNAME | cut -d. -f1)" + VIF_HOST="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)" fi setup_lxc $lxc $fcdistro $pldistro $personality