# 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
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)
echo debootstrap ;;
*)
echo Unknown distro $fcdistro ;;
cp /etc/yum.repos.d/fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/
# append fedora repo files with hardwired releasever 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
+ 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
# looks like all this business about fetching fedora-release is not needed
# it does
# 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 --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; }
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
# rpm --rebuilddb
chroot ${lxc_root} $personality rpm --rebuilddb
- 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,"
+ 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
case $fcdistro in
wheezy|jessie)
echo http://ftp2.fr.debian.org/debian/ ;;
- precise|trusty|utopic|vivid|wily|xenial)
+ trusty|xenial|bionic)
echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
*) echo unknown distro $fcdistro; exit 1;;
esac
[ -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 ; } || :
- # when migrating, sometimes we don't have the same uid/gid mapping
- # for the ssh_keys group on both host boxes...
- # also this is not wuite right, as *_key gets expanded in the host context
- # but using "" or \ makes it litteral...
- virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/env chown root:ssh_keys /etc/ssh/*_key
+ # 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)
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;;
# 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
git://git.onelab.eu / build.git / blobdiff