From fef31bedb34f230ff1c4fd6e8e77ba272efd6c8a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 9 Nov 2020 15:00:12 +0100 Subject: [PATCH] empty changes, just trailing spaces and other indentation --- build.common | 40 ++++++++++++++++++++-------------------- create-vm.sh | 13 ++++++------- lbuild-initvm.sh | 3 +-- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/build.common b/build.common index c88d8279..2007f112 100644 --- a/build.common +++ b/build.common @@ -20,7 +20,7 @@ function pl_getDistro() { case $distro in Scientific*) distro="SL" ; esac elif [ -f /etc/lsb-release ] ; then . /etc/lsb-release - distro=$DISTRIB_CODENAME + distro=$DISTRIB_CODENAME elif [ -f /etc/debian_version ] ; then case $(cat /etc/debian_version) in 7.*) distro=wheezy ;; @@ -70,7 +70,7 @@ function pl_getReleaseName () { ;; *) releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common" - echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" + echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" return 1 ;; esac @@ -117,7 +117,7 @@ pl_DISTRO_RELEASE=$(pl_getRelease) pl_DISTRO_NAME=$(pl_getReleaseName $pl_DISTRO $pl_DISTRO_RELEASE) # get path to appropriate yumgroups.xml file -# Thierry: quick & dirty improvement +# Thierry: quick & dirty improvement # this file is updated by the toplevel build, from the .pkgs files pl_DISTRO_YUMGROUPS="../../../RPMS/yumgroups.xml" @@ -166,7 +166,7 @@ function pl_root_makedevs() { vroot=$1 # Clean ${vroot}/dev, but only when ${vroot}!="" [ -n $vroot ] && rm -rf $vroot/dev - + mkdir -p $vroot/dev mknod -m 666 $vroot/dev/null c 1 3 mknod -m 666 $vroot/dev/zero c 1 5 @@ -192,7 +192,7 @@ function pl_root_makedevs() { mknod -m 600 $vroot/dev/net/tun c 10 200 # For mkinitrd (in case a kernel is being installed) - # As well as for loop back mounting within a vm. + # As well as for loop back mounting within a vm. for i in $(seq 0 255) ; do mknod -m 640 $vroot/dev/loop$i b 7 $i done @@ -245,13 +245,13 @@ function pl_root_mkfedora () { # parse pkgsfile and add to local vars fcdistro=${pl_DISTRO_NAME} - pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $pkgsfile) + pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $pkgsfile) pkgs_groups=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro group $pkgsfile) # what can get trashed to save space pkgs_junk=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro junk $pkgsfile) # but not this pkgs_precious=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro precious $pkgsfile) - # formerly related to mkfedora -k : packages to take from our own build + # formerly related to mkfedora -k : packages to take from our own build # and thus need be excluded frem the stock repos # locate builddir by looking for pkgs.py builddir=$(dirname $(type -p pkgs.py)) @@ -277,7 +277,7 @@ function pl_root_mkfedora () { if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$yumexclude_line" $mirrors ; then echo xxx -- error ; return 1 fi - + # Do not tolerate errors set -e @@ -288,7 +288,7 @@ function pl_root_mkfedora () { # you have to use at least one language beside 'C' # Prevent all locales from being installed in reference image mkdir -p $vroot/etc/rpm - pl_root_rpm_macros > $vroot/etc/rpm/macros + pl_root_rpm_macros > $vroot/etc/rpm/macros # Trick rpm and yum, who read the real root /etc/rpm/macros file # rather than the one installed in the reference image, despite what @@ -312,7 +312,7 @@ function pl_root_mkfedora () { mount -t tmpfs none $vroot/dev/shm mkdir -p $vroot/proc mount -t proc none $vroot/proc - + # Create a /var/lib dirs for yum & rpm mkdir -p $vroot/var/lib/yum mkdir -p $vroot/var/lib/rpm @@ -357,7 +357,7 @@ gpgcheck=0 # (e.g., from /etc/yum.repos.d/) reposdir=/dev/null EOF - + cat $yum_conf_repos >> $yum_conf # If we are being built as part of an automated RPM build, solve the @@ -399,7 +399,7 @@ fi if [ -n "$pkgs_packages" ] ; then echo "* Installing optional packages" $pkgs_packages # ignore yum's return code that is basically undefined - echo "* Install options" $vroot $yum_options + echo "* Install options" $vroot $yum_options yum $yum_options install $pkgs_packages || : if ! rpm --root $vroot -q $pkgs_packages >/dev/null ; then echo "* Warning: Missing packages" @@ -411,7 +411,7 @@ fi ## call yum sequentially to get finer-grained info on dependencies for group_plus in $pkgs_groups ; do group=$(echo $group_plus | sed -e "s,+++, ,g") - echo "* Installing optional group $group" + echo "* Installing optional group $group" # ignore yum's return code that is basically undefined yum $yum_options groupinstall "$group" || : done @@ -573,7 +573,7 @@ function pl_parsePkgs () { pldistro=$1; shift echo 1>&2 "pl_parsePkgs: using -a $target_arch -f $fcdistro -d $pldistro $keyword $@" - pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" + pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" } # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s] function pl_getPackages() { pl_parsePkgs package "$@" ; } @@ -648,7 +648,7 @@ __header echo "Cannot find groupname: and groupdesc: in $pkgsfile -- skipped" 1>&2 continue fi - + cat << __group_header $(echo $groupname|tr A-Z a-z) @@ -657,7 +657,7 @@ __header true __group_header - for package in $packages; do + for package in $packages; do echo "$package" done cat << __group_footer @@ -672,7 +672,7 @@ __footer function build_fetch () { - curl --fail --silent --max-time 60 --output /dev/null "$1" + curl --fail --silent --max-time 60 --output /dev/null "$1" } # tries to compute a valid yum.conf for that pldistro from the template in mirroring/ @@ -686,7 +686,7 @@ function yumconf_mirrors () { mirrors="$@" template=$builddir/mirroring/$fcdistro/yum.repos.d/building.repo.in - + if [ ! -f $template ] ; then echo "yumconf_mirrors: cannot locate template $template" rm -f $dest_yumconf @@ -714,7 +714,7 @@ function yumconf_mirror () { sed -e "s,@MIRRORURL@,$mirror,g" \ -e "/baseurl=/i\\ $yumexclude_line" $template > $dest_yumconf - + # capture all lines defining baseurl baseurl_defs=$(grep '^baseurl=' $dest_yumconf) if [ -z "$baseurl_defs" ] ; then @@ -751,7 +751,7 @@ function yumconf_gpgkey () { function yumconf_exclude () { repo=$1; shift yumexclude_line="$1" ; shift - + sed -i -e "/#baseurl=.*$/i\\ $yumexclude_line" $repo } diff --git a/create-vm.sh b/create-vm.sh index 49260682..696c8a80 100755 --- a/create-vm.sh +++ b/create-vm.sh @@ -10,21 +10,21 @@ DIRNAME=$(dirname $0) # something about asking questions during upgrades.. # so I had to turn off the redirection into ~/machines/.log # (*) more badly, the resulting container does not start its network upon boot -# everything is in place and it could be started manually +# everything is in place and it could be started manually # like for the record e.g. # ip link set dev eth0 up # ip address add 138.96.119.13/21 dev eth0 # ip route add default dev eth0 via 138.96.112.250 # ping -c 1 8.8.8.8 # trying to solve that last issue by apt-get install'ing network-manager -# (which was missing indeed) was not enough -# a bit more work seems to be needed if that became needed +# (which was missing indeed) was not enough +# a bit more work seems to be needed if that became needed BUILD="${HOME}/git-build" LOGS=$HOME/machines -[ -d $LOGS ] || { echo "Creating logs dir $LOGS" ; mkdir -p $LOGS; } +[ -d $LOGS ] || { echo "Creating logs dir $LOGS" ; mkdir -p $LOGS; } DOMAIN=pl.sophia.inria.fr @@ -33,7 +33,7 @@ DEFAULT_MEMORY=16384 CONFIRM= function usage () { - message="$@" + message="$@" echo "usage : $COMMAND [-c] [-f distro] [-i image] [ -m memory ] [ -n hostname ] [-s] container" echo " -c : confirm, will show the command and prompt for confirmation " echo " -f : set distro, default is $DEFAULT_DISTRO" @@ -90,7 +90,7 @@ initvm="$BUILD/lbuild-initvm.sh" [ -z "$IMAGE" ] && initvm="$initvm -f $DISTRO" || initvm="$initvm -i $IMAGE" initvm="$initvm -n $fqdn" [ -n "$DO_NOT_START_VM" ] && initvm="$initvm -s" -[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY" +[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY" initvm="$initvm $container" if [ -n "$CONFIRM" ] ; then @@ -101,4 +101,3 @@ fi echo "Running $initvm" echo "Storing output in $LOGS/$container.log" $initvm >& $LOGS/$container.log - diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 8a97233c..f43508f5 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -335,8 +335,7 @@ function fedora_configure_yum () { # 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 + 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," -- 2.43.0