tweaks for create-vm to not rely on our mirror
can be used with f32 even though we do not mirror it
initvm="$BUILD/lbuild-initvm.sh"
[ -z "$IMAGE" ] && initvm="$initvm -f $DISTRO" || initvm="$initvm -i $IMAGE"
initvm="$initvm -n $fqdn"
initvm="$BUILD/lbuild-initvm.sh"
[ -z "$IMAGE" ] && initvm="$initvm -f $DISTRO" || initvm="$initvm -i $IMAGE"
initvm="$initvm -n $fqdn"
+# always use fedora repos
+initvm="$initvm -u"
[ -n "$DO_NOT_START_VM" ] && initvm="$initvm -s"
[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY"
initvm="$initvm $container"
[ -n "$DO_NOT_START_VM" ] && initvm="$initvm -s"
[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY"
initvm="$initvm $container"
cp /etc/yum.repos.d/fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/
# append fedora repo files with hardwired releasever and basearch
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
# 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)
# 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; }
echo "$DNF install $FEDORA_PREINSTALLED"
$DNF install $FEDORA_PREINSTALLED || { echo "Failed to download rootfs, aborting." ; return 1; }
# rpm --rebuilddb
chroot ${lxc_root} $personality rpm --rebuilddb
# 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
# 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
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
cat > $lxc_root/etc/yum.repos.d/myplc.repo <<EOF
[myplc]
name= MyPLC
- 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;;
case $opt in
n) GUEST_HOSTNAME=$OPTARG;;
f) fcdistro=$OPTARG;;
d) pldistro=$OPTARG;;
p) personality=$OPTARG;;
+ r) MYPLC_REPO_URL=$OPTARG;;
+ u) USE_UPSTREAM_REPOS=true;;
P) PREINSTALLED=$OPTARG;;
i) IMAGE=$OPTARG;;
m) MEMORY=$OPTARG;;
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
# 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
echo "WARNING -- setting up a yum repo is recommended"
fi
fi
# oldies but we have references to that in the pkgs files
'f8', 'f10', 'f12', 'f14', 'f16', 'f18',
'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27',
# oldies but we have references to that in the pkgs files
'f8', 'f10', 'f12', 'f14', 'f16', 'f18',
'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27',
- # these ones are still relevant
- 'f29', 'f31', 'f33',
+ # these ones are still relevant;
+ # f32 is mentioned to be able to use create-vms with that distro
+ # as we're running into issues to build a minimal f33 from a f29 host
+ 'f29', 'f31', 'f32', 'f33',
# scientific linux
'sl6',
# debians
# scientific linux
'sl6',
# debians