# 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
# copy yum config and repo files
cp /etc/yum.conf $INSTALL_ROOT/etc/
cp /etc/yum.repos.d/fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/
+ # on boxes managed by Francis's upgrade script, we use other mirrors
+ cp /etc/yum.repos.d/so-fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/
# append fedora repo files with hardwired releasever and basearch
if [ -z "$USE_UPSTREAM_REPOS" ]; then
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)
# 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 () {
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=""
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)
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)"
+ [[ -z "$GUEST_IP" ]] && { echo "could not resolve $GUEST_HOSTNAME - exiting" ; exit 1 ; }
fi
setup_lxc $lxc $fcdistro $pldistro $personality