X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=lbuild-initvm.sh;h=b0e732c4262982cf51c879e386f3f51fa0f06fc9;hp=b9f035808ceff302a698d07ba91f06602f36a5dc;hb=HEAD;hpb=e633a7bfb6688c8c2cdde1a8ec1715bdbee3510c diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index b9f03580..58030ccc 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -30,7 +30,7 @@ function lxcroot () { # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s -DEFAULT_FCDISTRO=f33 +DEFAULT_FCDISTRO=f39 DEFAULT_PLDISTRO=lxc DEFAULT_PERSONALITY=linux64 DEFAULT_MEMORY=3072 @@ -82,7 +82,7 @@ function package_method () { case $fcdistro in f[0-9]*|centos[0-9]*|sl[0-9]*) echo dnf ;; - wheezy|jessie|trusty|xenial|bionic|focal) + wheezy|jessie|trusty|xenial|bionic|focal|jammy) echo debootstrap ;; *) echo "Unknown package_method for distro $fcdistro" ;; @@ -90,20 +90,25 @@ function package_method () { } ### return -# ifcfg for redhat's -# interfaces for older debian/uuntu -# systemd for more recent debian/ubuntu -function network_method () { +# ifcfg for fedora up to 36 +# networkmanager for fedora starting with f37 (probably works with older as well...) +# interfaces for older debian/uuntu +# systemd for more recent debian/ubuntu +function network_config_method () { local fcdistro=$1; shift case $fcdistro in - f[0-9]*|centos[0-9]*|sl[0-9]*) + # have not used centos or scientific linux for a very long time + #f[0-9]*|centos[0-9]*|sl[0-9]*) + f2*|f3[0-6]) echo ifcfg ;; + f3[7-9]|f[4-9]*) + echo networkmanager ;; wheezy|jessie|trusty|xenial|bionic) echo interfaces ;; - focal) + focal|jammy) echo systemd ;; *) - echo "Unknown network_method for distro $fcdistro" ;; + echo "Unknown network_config_method for distro $fcdistro" ;; esac } @@ -298,21 +303,39 @@ EOF fedora_configure_systemd $lxc - local guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST - mkdir -p $(dirname ${guest_ifcfg}) - # starting with f27, we go for NetworkManager - # no more NM_CONTROLLED nonsense - if [ -n "$NAT_MODE" ]; then - write_guest_ifcfg_natip - else - write_guest_ifcfg_publicip - fi > $guest_ifcfg + fedora_configure_network $lxc [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro return 0 } +function fedora_configure_network() { + local lxc="$1" + case $(network_config_method $fcdistro) in + ifcfg) + # probably no longer useful + local guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST + mkdir -p $(dirname ${guest_ifcfg}) + if [ -n "$NAT_MODE" ]; then + write_guest_ifcfg_natip + else + write_guest_ifcfg_publicip + fi > $guest_ifcfg + ;; + networkmanager) + local guest_keyfile=${lxc_root}/etc/NetworkManager/system-connections/'Wired connection 1.nmconnection' + mkdir -p $(dirname "${guest_keyfile}") + if [ -n "$NAT_MODE" ]; then + write_guest_networkmanager_natip + else + write_guest_networkmanager_publicip + fi > "$guest_keyfile" + chmod 600 "$guest_keyfile" + ;; + esac +} + # this code of course is for guests that do run on systemd function fedora_configure_systemd() { set -e @@ -331,9 +354,7 @@ function fedora_configure_systemd() { # sed -i 's/After=dev-%i.device/After=/' ${lxc_root}/lib/systemd/system/getty\@.service ln -sf /dev/null ${lxc_root}/etc/systemd/system/"getty@.service" rm -f ${lxc_root}/etc/systemd/system/getty.target.wants/*service || : -# can't seem to handle this one with systemctl -# second part should trigger starting with fedora31, where the network target is not manually manageable - chroot ${lxc_root} $personality chkconfig network on || chroot ${lxc_root} $personality systemctl enable NetworkManager + chroot ${lxc_root} $personality systemctl enable NetworkManager } # overwrite container yum config @@ -396,7 +417,7 @@ function debian_mirror () { case $fcdistro in wheezy|jessie) echo http://ftp2.fr.debian.org/debian/ ;; - trusty|xenial|bionic|focal) + trusty|xenial|bionic|focal|jammy) echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;; *) echo unknown distro $fcdistro; exit 1;; esac @@ -427,7 +448,7 @@ EOF function debian_configure () { local lxc=$1; shift local fcdistro=$1; shift - case $(network_method $fcdistro) in + case $(network_config_method $fcdistro) in interfaces) local guest_interfaces=${lxc_root}/etc/network/interfaces ( [ -n "$NAT_MODE" ] \ @@ -485,6 +506,31 @@ Gateway=$GATEWAY EOF } +function uuid() { + python -c "import uuid; print(uuid.uuid1())" +} +# xxx this seems to be no longer needed ? +function write_guest_networkmanager_natip() { + cat << EOF +EOF +} +function write_guest_networkmanager_publicip() { + cat << EOF +[connection] +id=Wired connection 1 +uuid=$(uuid) +type=ethernet +autoconnect-priority=-999 +# setting this seems to be counter-productive +# interface-name=${VIF_GUEST} + +[ipv4] +address1=${GUEST_IP}/${MASKLEN},${GATEWAY} +#dhcp-hostname=${GUEST_HOSTNAME} +method=manual +EOF +} + ############################## function setup_lxc() { @@ -532,7 +578,14 @@ function setup_lxc() { ### set up resolv.conf from host # ubuntu precise and on, /etc/resolv.conf is a symlink to ../run/resolvconf/resolv.conf [ -h $lxc_root/etc/resolv.conf ] && rm -f $lxc_root/etc/resolv.conf - cp /etc/resolv.conf $lxc_root/etc/resolv.conf + ### since fedora36, our hosts use systemd-resolved, but the guests can't use that + # so the administrator has the option to create /etc/resolv.conf.containers + # and if that file exists it will be copied in the containers instead of /etc/resolv.conf + if [ -f /etc/resolv.conf.containers ]; then + cp /etc/resolv.conf.containers $lxc_root/etc/resolv.conf + else + cp /etc/resolv.conf $lxc_root/etc/resolv.conf + fi ### and /etc/hosts for at least localhost [ -f $lxc_root/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $lxc_root/etc/hosts @@ -678,9 +731,9 @@ function devel_or_test_tools () { local pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED) ### install individual packages, then groups - # get target arch - use uname -i here (we want either x86_64 or i386) + # get target arch - (we want either x86_64 or i386) - local lxc_arch=$(chroot ${lxc_root} $personality uname -i) + local lxc_arch=$(chroot ${lxc_root} $personality arch) # on debian systems we get arch through the 'arch' command [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot ${lxc_root} $personality arch) @@ -804,7 +857,7 @@ function post_install_myplc () { [ -f /etc/sysconfig/network ] || /bin/echo NETWORKING=yes > /etc/sysconfig/network # turn off regular crond, as plc invokes plc_crond - /sbin/chkconfig crond off + /sbin/chkconfig crond off >& /dev/null # customize root's prompt /bin/cat << PROFILE > /root/.profile @@ -819,13 +872,38 @@ EOF # 1st version was relying on virsh net-dhcp-leases # however this was too fragile, would not work for fedora14 containers # WARNING: this code is duplicated in lbuild-nightly.sh -function guest_ipv4() { - local lxc=$1; shift +function guest_ipv4_old() { + lxc=$1; shift + + mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}') + [ -z "$mac" ] && { echo 1>&2 guest_ipv4_old cannot find mac; return 1; } + ip=$(arp -en | grep "$mac" | awk '{print $1;}') + # if not known: run a ping and try again + if [ -z $ip ]; then + ping -c1 -w1 -W1 $lxc >& /dev/null + ping -c1 -w1 -W1 $lxc.pl.sophia.inria.fr >& /dev/null + ip=$(arp -en | grep "$mac" | awk '{print $1;}') + fi + [ -z "$ip" ] && { echo 1>&2 guest_ipv4_old cannot find ip; return 1; } + echo $ip +} - local mac=$(virsh -c lxc:/// domiflist $lxc | egrep 'network|bridge' | awk '{print $5;}') - # sanity check - [ -z "$mac" ] && return 0 - arp -en | grep "$mac" | awk '{print $1;}' +function guest_ipv4() { + lxc=$1; shift + + # this gives us the libvirt_lxc pid for the container + local lxc_pid=$(virsh -c lxc:/// dominfo $lxc | grep '^Id:' | awk '{print $2;}' | sed -e "s|-||g") + [[ -z "$lxc_pid" ]] && { echo 1>&2 guest_ipv4 cannot find lxc pid; return 1; } + # but we need the systemd (pid=1) instance for the container + local systemd_pid=$(pgrep -P $lxc_pid systemd) + [[ -z "$systemd_pid" ]] && { echo 1>&2 guest_ipv4 cannot systemd pid; return 1; } + # from there we can inspect the network interfaces + local domip=$(nsenter -t $systemd_pid -n ip -br addr show eth0 \ + | awk '{print $3}' \ + | cut -d/ -f1 \ + ) + [ -z "$domip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; } + echo $domip } function wait_for_ssh () { @@ -835,7 +913,8 @@ function wait_for_ssh () { local lxc=$1; shift # if run in public_ip mode, we know the IP of the guest and it is specified here - [ -n "$1" ] && { guest_ip=$1; shift; } + local specified_ip + [ -n "$1" ] && { specified_ip=$1; shift; } #wait max 2 min for sshd to start local success="" @@ -844,14 +923,19 @@ function wait_for_ssh () { local counter=1 while [ "$current_time" -lt "$stop_time" ] ; do - echo "$counter-th attempt to reach sshd in container $lxc ..." - [ -z "$guest_ip" ] && guest_ip=$(guest_ipv4 $lxc) - [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip 'uname -i' && { + if [ -n "$specified_ip" ]; then + guest_ip="${specified_ip}" + else + guest_ip=$(guest_ipv4 $lxc) || : + fi + echo "$counter-th attempt to reach sshd in container $lxc on address $guest_ip ..." + [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip arch && { success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || : # some of our boxes have gone through a long upgrade historically, and # so they don't end up with the same gid mapping for the ssh_keys # group as the ones in the guest that result from a fresh install - virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "chown root:ssh_keys /etc/ssh/*_key" || : + # 2024 : lxc-enter-namespace is broken anyways + # virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "chown root:ssh_keys /etc/ssh/*_key" || : counter=$(($counter+1)) sleep 10 current_time=$(date +%s) @@ -1009,7 +1093,7 @@ function main () { 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) + NETMASK=$(masklen_to_netmask $MASKLEN) GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1) VIF_HOST="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)" fi