# 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=f33
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MEMORY=3072
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 <<EOF
+ local masklen=$1; shift
+ python3 <<EOF
import sys
-masklen=$masklen
-if not (masklen>=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)
echo debootstrap ;;
*)
- echo Unknown distro $fcdistro ;;
+ echo "Unknown package_method for distro $fcdistro" ;;
+ esac
+}
+
+### return
+# ifcfg for redhat's
+# interfaces for older debian/uuntu
+# systemd for more recent debian/ubuntu
+function network_method () {
+ local fcdistro=$1; shift
+ case $fcdistro in
+ f[0-9]*|centos[0-9]*|sl[0-9]*)
+ echo ifcfg ;;
+ wheezy|jessie|trusty|xenial|bionic)
+ echo interfaces ;;
+ focal)
+ echo systemd ;;
+ *)
+ echo "Unknown network_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
# the new test framework creates /timestamp in /vservers/<name> *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 ]
}
##############################
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
(
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"
function fedora_download() {
set -x
- cache=$1; shift
+ local cache=$1; shift
# check the mini fedora was not already downloaded
INSTALL_ROOT=$cache/partial
# 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
# 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; }
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
$GUEST_HOSTNAME
EOF
- 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
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
+ 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
[ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro
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
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
+# 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
}
# overwrite container yum config
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 <<EOF
-[fedora]
-name=Fedora \$releasever - \$basearch
-baseurl=$FEDORA_MIRROR_BASE/releases/\$releasever/Everything/\$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
-
-[updates]
-name=Fedora \$releasever - \$basearch - Updates
-baseurl=$FEDORA_MIRROR_BASE/updates/\$releasever/\$basearch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
-EOF
+ if [ -z "$USE_UPSTREAM_REPOS" ]; then
+ echo "Initializing yum.repos.d in $lxc"
+ rm -f $lxc_root/etc/yum.repos.d/*
+ # use mirroring/ stuff instead of a hard-wired config
+ local repofile=$lxc_root/etc/yum.repos.d/building.repo
+ yumconf_mirrors $repofile ${DIRNAME} $fcdistro "" $FEDORA_MIRROR
+ # the keys stuff requires adjustment though
+ sed -i $repofile -e s,'gpgkey=.*',"gpgkey=${FEDORA_MIRROR_KEYS}/RPM-GPG-KEY-fedora-${fedora_release}-primary,"
+ fi
# import fedora key so that gpgckeck does not whine or require stdin
# required since fedora24
rpm --root $lxc_root --import $FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
# for using this script as a general-purpose lxc creation wrapper
# just mention 'none' as the repo url
- if [ -n "$REPO_URL" ] ; then
+ if [ -n "$MYPLC_REPO_URL" ] ; then
if [ ! -d $lxc_root/etc/yum.repos.d ] ; then
echo "WARNING : cannot create myplc repo"
else
cat > $lxc_root/etc/yum.repos.d/myplc.repo <<EOF
[myplc]
name= MyPLC
-baseurl=$REPO_URL
+baseurl=$MYPLC_REPO_URL
enabled=1
gpgcheck=0
EOF
# http://mirrors.ubuntu.com/mirrors.txt
# need to specify the right mirror for debian variants like ubuntu and the like
function debian_mirror () {
- fcdistro=$1; shift
+ local fcdistro=$1; shift
case $fcdistro in
wheezy|jessie)
echo http://ftp2.fr.debian.org/debian/ ;;
- precise|trusty|utopic|vivid|wily|xenial)
+ trusty|xenial|bionic|focal)
echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
*) echo unknown distro $fcdistro; exit 1;;
esac
function debian_install () {
set -e
set -x
- lxc=$1; shift
- lxc_root=$(lxcroot $lxc)
+ local lxc=$1; shift
+ local lxc_root=$(lxcroot $lxc)
mkdir -p $lxc_root
- arch=$(canonical_arch $personality $fcdistro)
- mirror=$(debian_mirror $fcdistro)
+ local arch=$(canonical_arch $personality $fcdistro)
+ local mirror=$(debian_mirror $fcdistro)
debootstrap --no-check-gpg --arch $arch $fcdistro $lxc_root $mirror
# just like with fedora we ensure a few packages get installed as well
# not started yet
}
function debian_configure () {
- guest_interfaces=${lxc_root}/etc/network/interfaces
- ( [ -n "$NAT_MODE" ] && write_guest_interfaces_natip || write_guest_interfaces_publicip ) > $guest_interfaces
+ local lxc=$1; shift
+ local fcdistro=$1; shift
+ case $(network_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 () {
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 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
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"
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
#
function write_lxc_xml_publicip () {
- lxc=$1; shift
- lxc_root=$(lxcroot $lxc)
+ local lxc=$1; shift
+ local lxc_root=$(lxcroot $lxc)
cat <<EOF
<domain type='lxc'>
<name>$lxc</name>
# 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 <<EOF
<domain type='lxc'>
<name>$lxc</name>
DEVICE=$VIF_GUEST
BOOTPROTO=dhcp
ONBOOT=yes
-NM_CONTROLLED=no
TYPE=Ethernet
MTU=1500
EOF
IPADDR=$GUEST_IP
NETMASK=$NETMASK
GATEWAY=$GATEWAY
-NM_CONTROLLED=no
TYPE=Ethernet
MTU=1500
EOF
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)
- lxc_arch=$(chroot ${lxc_root} $personality uname -i)
+ local lxc_arch=$(chroot ${lxc_root} $personality uname -i)
# 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
}
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
# 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
}
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
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
# however this was too fragile, would not work for fedora14 containers
# WARNING: this code is duplicated in lbuild-nightly.sh
function guest_ipv4() {
- lxc=$1; shift
+ local lxc=$1; shift
- mac=$(virsh -c lxc:/// domiflist $lxc | egrep 'network|bridge' | awk '{print $5;}')
+ 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;}'
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; }
#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)
+ 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 ; } || :
+ # 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" || :
+ counter=$(($counter+1))
+ sleep 10
+ current_time=$(date +%s)
done
# Thierry: this is fatal, let's just exit with a failure here
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;;
# 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 && \
# 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
# 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
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