X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=lbuild-initvm.sh;h=b0e732c4262982cf51c879e386f3f51fa0f06fc9;hp=30e720fd7a7c6b7d122f655d38bd2282ec13309a;hb=HEAD;hpb=a4f739908d1f072a007fc24b22a76e9b1d20cc48 diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 30e720fd..58030ccc 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -24,13 +24,13 @@ export PATH=$PATH:/bin:/sbin # it works, but this really is poor practice # we should have an lxc_root function instead function lxcroot () { - lxc=$1; shift + local lxc=$1; shift echo /vservers/$lxc } # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s -DEFAULT_FCDISTRO=f29 +DEFAULT_FCDISTRO=f39 DEFAULT_PLDISTRO=lxc DEFAULT_PERSONALITY=linux64 DEFAULT_MEMORY=3072 @@ -43,62 +43,92 @@ PUBLIC_BRIDGE=br0 VIF_GUEST=eth0 ########## -FEDORA_MIRROR_BASE="http://mirror.onelab.eu/fedora/" +FEDORA_MIRROR="http://mirror.onelab.eu/" FEDORA_MIRROR_KEYS="http://mirror.onelab.eu/keys/" FEDORA_PREINSTALLED="dnf dnf-yum passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients" DEBIAN_PREINSTALLED="openssh-server openssh-client" ########## networking utilities function gethostbyname () { - hostname=$1 - python -c "import socket; print socket.gethostbyname('"$hostname"')" 2> /dev/null + local hostname=$1 + python3 -c "import socket; print(socket.gethostbyname('"$hostname"'))" 2> /dev/null } # e.g. 21 -> 255.255.248.0 function masklen_to_netmask () { - masklen=$1; shift - python <=1 and masklen<=32): - print "Wrong masklen",masklen +masklen = $masklen +if not (1 <= masklen <= 32): + print("Wrong masklen", masklen) exit(1) -result=[] +result = [] for i in range(4): - if masklen>=8: + if masklen >= 8: result.append(8) - masklen-=8 + masklen -= 8 else: result.append(masklen) - masklen=0 -print ".".join([ str(256-2**(8-i)) for i in result ]) - + masklen = 0 +print(".".join([ str(256-2**(8-i)) for i in result ])) EOF } ############################## # return dnf or debootstrap function package_method () { - fcdistro=$1; shift + local fcdistro=$1; shift case $fcdistro in f[0-9]*|centos[0-9]*|sl[0-9]*) echo dnf ;; - wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial) + wheezy|jessie|trusty|xenial|bionic|focal|jammy) echo debootstrap ;; *) - echo Unknown distro $fcdistro ;; + echo "Unknown package_method for distro $fcdistro" ;; + esac +} + +### return +# 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 + # 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|jammy) + echo systemd ;; + *) + echo "Unknown network_config_method for distro $fcdistro" ;; esac } # return arch from debian distro and personality function canonical_arch () { - personality=$1; shift - fcdistro=$1; shift + local personality=$1; shift + local fcdistro=$1; shift case $(package_method $fcdistro) in dnf) - case $personality in *32) echo i386 ;; *64) echo x86_64 ;; *) echo Unknown-arch-1 ;; esac ;; + case $personality in + *32) echo i386 ;; + *64) echo x86_64 ;; + *) echo Unknown-arch-1 ;; + esac ;; debootstrap) - case $personality in *32) echo i386 ;; *64) echo amd64 ;; *) echo Unknown-arch-2 ;; esac ;; + case $personality in + *32) echo i386 ;; + *64) echo amd64 ;; + *) echo Unknown-arch-2 ;; + esac ;; *) echo Unknown-arch-3 ;; esac @@ -106,11 +136,12 @@ function canonical_arch () { # the new test framework creates /timestamp in /vservers/ *before* populating it function almost_empty () { - dir="$1"; shift ; + local dir="$1"; shift ; # non existing is fine [ ! -d $dir ] && return 0; # need to have at most one file - count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; + local count=$(cd $dir; ls | wc -l) + [ $count -le 1 ] } ############################## @@ -118,10 +149,10 @@ function fedora_install() { set -x set -e - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local lxc_root=$(lxcroot $lxc) - cache=/var/cache/lxc/fedora/$arch/${fedora_release} + local cache=/var/cache/lxc/fedora/$arch/${fedora_release} mkdir -p $cache ( @@ -132,7 +163,7 @@ function fedora_install() { fedora_download $cache || { echo "Failed to download 'fedora base'"; return 1; } else echo "Updating cache $cache/rootfs ..." - if ! dnf --installroot $cache/rootfs --releasever ${fedora_release} -y --nogpgcheck update ; then + if ! dnf --installroot $cache/rootfs --releasever=${fedora_release} -y --nogpgcheck update ; then echo "Failed to update 'fedora base', continuing with last known good cache" else echo "Update finished" @@ -152,7 +183,7 @@ function fedora_install() { function fedora_download() { set -x - cache=$1; shift + local cache=$1; shift # check the mini fedora was not already downloaded INSTALL_ROOT=$cache/partial @@ -170,38 +201,44 @@ function fedora_download() { # copy yum config and repo files cp /etc/yum.conf $INSTALL_ROOT/etc/ - cp /etc/yum.repos.d/fedora* $INSTALL_ROOT/etc/yum.repos.d/ + cp /etc/yum.repos.d/fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/ - # append fedora repo files with desired ${fedora_release} and $basearch - for f in $INSTALL_ROOT/etc/yum.repos.d/* ; do - sed -i "s/\$basearch/$arch/g; s/\$releasever/${fedora_release}/g;" $f - done - - MIRROR_URL=$FEDORA_MIRROR_BASE/releases/${fedora_release}/Everything/$arch/os - # since fedora18 the rpms are scattered by first name - # first try the second version of fedora-release first - RELEASE_URLS="" - for subindex in 3 2 1; do - RELEASE_URLS="$RELEASE_URLS $MIRROR_URL/Packages/f/fedora-release-${fedora_release}-1.noarch.rpm" - done + # append fedora repo files with hardwired releasever and basearch + if [ -z "$USE_UPSTREAM_REPOS" ]; then + for f in $INSTALL_ROOT/etc/yum.repos.d/* ; do + sed -i "s/\$basearch/$arch/g; s/\$releasever/${fedora_release}/g;" $f + done + fi - RELEASE_TARGET=$INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm - found="" - for attempt in $RELEASE_URLS; do - if curl --silent --fail $attempt -o $RELEASE_TARGET; then - echo "Successfully Retrieved $attempt" - found=true - break - else - echo "Failed (not to worry about) with attempt $attempt" - fi - done - [ -n "$found" ] || { echo "Could not retrieve fedora-release rpm - exiting" ; exit 1; } +# looks like all this business about fetching fedora-release is not needed +# it does +# MIRROR_URL=$FEDORA_MIRROR/fedora/releases/${fedora_release}/Everything/$arch/os +# # since fedora18 the rpms are scattered by first name +# # first try the second version of fedora-release first +# RELEASE_URLS="" +# local subindex +# for subindex in 3 2 1; do +# RELEASE_URLS="$RELEASE_URLS $MIRROR_URL/Packages/f/fedora-release-${fedora_release}-${subindex}.noarch.rpm" +# done +# +# RELEASE_TARGET=$INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm +# local found="" +# local attempt +# for attempt in $RELEASE_URLS; do +# if curl --silent --fail $attempt -o $RELEASE_TARGET; then +# echo "Successfully Retrieved $attempt" +# found=true +# break +# else +# echo "Failed (not to worry about) with attempt $attempt" +# fi +# done +# [ -n "$found" ] || { echo "Could not retrieve fedora-release rpm - exiting" ; exit 1; } mkdir -p $INSTALL_ROOT/var/lib/rpm rpm --root $INSTALL_ROOT --initdb # when installing f12 this apparently is already present, so ignore result - rpm --root $INSTALL_ROOT -ivh $INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm || : +# rpm --root $INSTALL_ROOT -ivh $INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm || : # however f12 root images won't get created on a f18 host # (the issue here is the same as the one we ran into when dealing with a vs-box) # in a nutshell, in f12 the glibc-common and filesystem rpms have an apparent conflict @@ -212,7 +249,7 @@ function fedora_download() { # So ideally if we want to be able to build f12 images from f18 we need an rpm that has # this patch undone, like we have in place on our f14 boxes (our f14 boxes need a f18-like rpm) - DNF="dnf --installroot=$INSTALL_ROOT --releasever=${fedora_release} --nogpgcheck -y" + DNF="dnf --installroot=$INSTALL_ROOT --nogpgcheck -y --releasever=${fedora_release}" echo "$DNF install $FEDORA_PREINSTALLED" $DNF install $FEDORA_PREINSTALLED || { echo "Failed to download rootfs, aborting." ; return 1; } @@ -228,36 +265,23 @@ function fedora_configure() { set -x set -e - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local fcdistro=$1; shift + local lxc_root=$(lxcroot $lxc) # disable selinux in fedora mkdir -p $lxc_root/selinux echo 0 > $lxc_root/selinux/enforce - # set the hostname - case "$fcdistro" in - f18|f2?) - cat < ${lxc_root}/etc/sysconfig/network + # enable networking and set hostname + cat < ${lxc_root}/etc/sysconfig/network NETWORKING=yes EOF - cat < ${lxc_root}/etc/hostname + cat < ${lxc_root}/etc/hostname $GUEST_HOSTNAME EOF - echo ;; - *) - cat < ${lxc_root}/etc/sysconfig/network -NETWORKING=yes -HOSTNAME=$GUEST_HOSTNAME -EOF - # set minimal hosts - cat < $lxc_root/etc/hosts -127.0.0.1 localhost $GUEST_HOSTNAME -EOF - echo ;; - esac - dev_path="${lxc_root}/dev" + local dev_path="${lxc_root}/dev" rm -rf $dev_path mkdir -p $dev_path mknod -m 666 ${dev_path}/null c 1 3 @@ -277,41 +301,47 @@ EOF mknod -m 600 ${dev_path}/initctl p mknod -m 666 ${dev_path}/ptmx c 5 2 - if [ "$(echo $fcdistro | cut -d"f" -f2)" -le "14" ]; then - fedora_configure_init $lxc - else - fedora_configure_systemd $lxc - fi + fedora_configure_systemd $lxc - guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST - ( [ -n "$NAT_MODE" ] && write_guest_ifcfg_natip || write_guest_ifcfg_publicip ) > $guest_ifcfg + fedora_configure_network $lxc [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro return 0 } -function fedora_configure_init() { - set -e - set -x - lxc=$1; shift - lxc_root=$(lxcroot $lxc) - - sed -i 's|.sbin.start_udev||' ${lxc_root}/etc/rc.sysinit - sed -i 's|.sbin.start_udev||' ${lxc_root}/etc/rc.d/rc.sysinit - # don't mount devpts, for pete's sake - sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.sysinit - sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.d/rc.sysinit - chroot ${lxc_root} $personality chkconfig udev-post off - chroot ${lxc_root} $personality chkconfig network on +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 set -x - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local lxc_root=$(lxcroot $lxc) # so ignore if we can't find /etc/systemd at all [ -d ${lxc_root}/etc/systemd ] || return 0 @@ -324,8 +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 - chroot ${lxc_root} $personality chkconfig network on + chroot ${lxc_root} $personality systemctl enable NetworkManager } # overwrite container yum config @@ -334,42 +363,31 @@ function fedora_configure_yum () { set -e trap failure ERR INT - lxc=$1; shift - fcdistro=$1; shift - pldistro=$1; shift + local lxc=$1; shift + local fcdistro=$1; shift + local pldistro=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc_root=$(lxcroot $lxc) # rpm --rebuilddb chroot ${lxc_root} $personality rpm --rebuilddb - echo "Initializing yum.repos.d in $lxc" - rm -f $lxc_root/etc/yum.repos.d/* - - cat > $lxc_root/etc/yum.repos.d/building.repo < $lxc_root/etc/yum.repos.d/myplc.repo < $guest_interfaces + local lxc=$1; shift + local fcdistro=$1; shift + case $(network_config_method $fcdistro) in + interfaces) + local guest_interfaces=${lxc_root}/etc/network/interfaces + ( [ -n "$NAT_MODE" ] \ + && write_guest_interfaces_natip \ + || write_guest_interfaces_publicip ) > $guest_interfaces + ;; + systemd) + local systemd_config="${lxc_root}/etc/systemd/network/wired.network" + ( [ -n "$NAT_MODE" ] \ + && write_guest_systemd_natip \ + || write_guest_systemd_publicip ) > $systemd_config + chroot "${lxc_root}" systemctl enable systemd-networkd + ;; + esac } function write_guest_interfaces_natip () { @@ -449,6 +481,56 @@ netmask $NETMASK gateway $GATEWAY EOF } + +# systemd-networkd +# https://wiki.archlinux.org/title/systemd-networkd +# https://www.linuxtricks.fr/wiki/systemd-le-reseau-avec-systemd-networkd +function write_guest_systemd_natip () { + cat << EOF +[Match] +Name=eth0 + +[Network] +DHCP=ipv4 +EOF +} + +function write_guest_systemd_publicip () { + cat << EOF +[Match] +Name=eth0 + +[Network] +Address=${GUEST_IP}/${MASKLEN} +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() { @@ -456,12 +538,12 @@ function setup_lxc() { set -e #trap failure ERR INT - lxc=$1; shift - fcdistro=$1; shift - pldistro=$1; shift - personality=$1; shift + local lxc=$1; shift + local fcdistro=$1; shift + local pldistro=$1; shift + local personality=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc_root=$(lxcroot $lxc) # create lxc container @@ -476,13 +558,13 @@ function setup_lxc() { chroot $(lxcroot $lxc) $personality rm -rf /var/lib/rpm/__db.00{0,1,2,3,4,5,6,7,8,9} chroot $(lxcroot $lxc) $personality rpm --rebuilddb fi - fedora_configure $lxc || { echo "failed to configure fedora for a container"; exit 1 ; } + fedora_configure $lxc $fcdistro || { echo "failed to configure fedora for a container"; exit 1 ; } ;; debootstrap) if [ -z "$IMAGE" ]; then debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; } fi - debian_configure || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; } + debian_configure $lxc $fcdistro || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; } ;; *) echo "$COMMAND:: unknown package_method - exiting" @@ -496,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 @@ -507,7 +596,7 @@ function setup_lxc() { chmod 600 $lxc_root/root/.ssh/authorized_keys # don't keep the input xml, this can be retrieved at all times with virsh dumpxml - config_xml=/tmp/$lxc.xml + local config_xml=/tmp/$lxc.xml ( [ -n "$NAT_MODE" ] && write_lxc_xml_natip $lxc || write_lxc_xml_publicip $lxc ) > $config_xml # define lxc container for libvirt @@ -526,8 +615,8 @@ function setup_lxc() { # function write_lxc_xml_publicip () { - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local lxc_root=$(lxcroot $lxc) cat < $lxc @@ -562,8 +651,8 @@ EOF # grant build guests the ability to do mknods function write_lxc_xml_natip () { - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local lxc_root=$(lxcroot $lxc) cat < $lxc @@ -604,7 +693,6 @@ function write_guest_ifcfg_natip () { DEVICE=$VIF_GUEST BOOTPROTO=dhcp ONBOOT=yes -NM_CONTROLLED=no TYPE=Ethernet MTU=1500 EOF @@ -620,7 +708,6 @@ HOSTNAME=$GUEST_HOSTNAME IPADDR=$GUEST_IP NETMASK=$NETMASK GATEWAY=$GATEWAY -NM_CONTROLLED=no TYPE=Ethernet MTU=1500 EOF @@ -632,45 +719,45 @@ function devel_or_test_tools () { set -e trap failure ERR INT - lxc=$1; shift - fcdistro=$1; shift - pldistro=$1; shift - personality=$1; shift + local lxc=$1; shift + local fcdistro=$1; shift + local pldistro=$1; shift + local personality=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc_root=$(lxcroot $lxc) - pkg_method=$(package_method $fcdistro) + local pkg_method=$(package_method $fcdistro) - pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED) + 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) - 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) - packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile) - groups=$(pl_getGroups -a $lxc_arch $fcdistro $pldistro $pkgsfile) + local packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile) + local groups=$(pl_getGroups -a $lxc_arch $fcdistro $pldistro $pkgsfile) case "$pkg_method" in dnf) # --allowerasing required starting with fedora24 # - has_dnf="" + local has_dnf="" chroot ${lxc_root} $personality dnf --version && has_dnf=true if [ -n "$has_dnf" ]; then echo "container has dnf - invoking with --allowerasing" - pkg_installer="dnf -y install --allowerasing" - grp_installer="dnf -y groupinstall --allowerasing" + local pkg_installer="dnf -y install --allowerasing" + local grp_installer="dnf -y groupinstall --allowerasing" else echo "container has only dnf" - pkg_installer="dnf -y install" - grp_installer="dnf -y groupinstall" + local pkg_installer="dnf -y install" + local grp_installer="dnf -y groupinstall" fi [ -n "$packages" ] && chroot ${lxc_root} $personality $pkg_installer $packages for group_plus in $groups; do - group=$(echo $group_plus | sed -e "s,+++, ,g") + local group=$(echo $group_plus | sed -e "s,+++, ,g") chroot ${lxc_root} $personality $grp_installer "$group" done # store current rpm list in /init-lxc.rpms in case we need to check the contents @@ -703,9 +790,9 @@ function devel_or_test_tools () { } function post_install () { - lxc=$1; shift - personality=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local personality=$1; shift + local lxc_root=$(lxcroot $lxc) # setup localtime from the host cp /etc/localtime $lxc_root/etc/localtime sshd_disable_password_auth $lxc @@ -725,8 +812,8 @@ function post_install () { # just in case, let's stay on the safe side function sshd_disable_password_auth () { - lxc=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local lxc_root=$(lxcroot $lxc) sed --in-place=.password -e 's,^#\?PasswordAuthentication.*,PasswordAuthentication no,' \ $lxc_root/etc/ssh/sshd_config } @@ -737,9 +824,9 @@ function post_install_natip () { set -e trap failure ERR INT - lxc=$1; shift - personality=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local personality=$1; shift + local lxc_root=$(lxcroot $lxc) ### From myplc-devel-native.spec # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation @@ -759,9 +846,9 @@ function post_install_myplc () { set -e trap failure ERR INT - lxc=$1; shift - personality=$1; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1; shift + local personality=$1; shift + local lxc_root=$(lxcroot $lxc) # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation cat << EOF | chroot ${lxc_root} $personality bash -x @@ -770,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 @@ -785,38 +872,73 @@ 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_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 +} + function guest_ipv4() { lxc=$1; shift - 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;}' + # 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 () { set -x set -e - lxc=$1; shift + 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 - success="" - current_time=$(date +%s) - stop_time=$(($current_time + 120)) + local success="" + local current_time=$(date +%s) + local stop_time=$(($current_time + 120)) - counter=1 + 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' && { - success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || : - counter=$(($counter+1)) - sleep 10 - current_time=$(date +%s) + 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 + # 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) done # Thierry: this is fatal, let's just exit with a failure here @@ -866,13 +988,14 @@ function main () { fi START_VM=true - while getopts "n:f:d:p:r:P:i:m:sv" opt ; do + while getopts "n:f:d:p:r:uP:i:m:sv" opt ; do case $opt in n) GUEST_HOSTNAME=$OPTARG;; f) fcdistro=$OPTARG;; d) pldistro=$OPTARG;; p) personality=$OPTARG;; - r) REPO_URL=$OPTARG;; + r) MYPLC_REPO_URL=$OPTARG;; + u) USE_UPSTREAM_REPOS=true;; P) PREINSTALLED=$OPTARG;; i) IMAGE=$OPTARG;; m) MEMORY=$OPTARG;; @@ -886,10 +1009,12 @@ function main () { # parse fixed arguments [[ -z "$@" ]] && usage - lxc=$1 ; shift - lxc_root=$(lxcroot $lxc) + local lxc=$1 ; shift + local lxc_root=$(lxcroot $lxc) # rainchecks + # when using with the -i option, checking that $lxc_root is void + # is a little too much stress.. almost_empty $lxc_root || \ { echo "container $lxc already exists in $lxc_root - exiting" ; exit 1 ; } virsh -c lxc:/// domuuid $lxc >& /dev/null && \ @@ -898,9 +1023,13 @@ function main () { # if IMAGE, copy the provided rootfs to lxc_root if [ -n "$IMAGE" ] ; then - [ ! -d "$IMAGE" ] && \ - { echo "$IMAGE rootfs folder does not exist - exiting" ; exit 1 ; } - rsync -a $IMAGE/ $lxc_root/ + if [ ! -d "$IMAGE" ]; then + echo "$IMAGE rootfs folder does not exist - exiting" + exit 1 + else + echo "Copying $IMAGE into $lxc_root with rsync --archive --delete" + rsync --archive --delete $IMAGE/ $lxc_root/ + fi fi # check we've exhausted the arguments @@ -934,9 +1063,9 @@ function main () { # as this command can be used in other contexts, not specifying # a repo is considered a warning # use -r none to get rid of this warning - if [ "$REPO_URL" == "none" ] ; then - REPO_URL="" - elif [ -z "$REPO_URL" ] ; then + if [ "$MYPLC_REPO_URL" == "none" ] ; then + MYPLC_REPO_URL="" + elif [ -z "$MYPLC_REPO_URL" ] ; then echo "WARNING -- setting up a yum repo is recommended" fi fi @@ -963,8 +1092,8 @@ 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) + 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="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)" fi