X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=e3e84890c6cfb2fb432fef8c7384729dd9b9bc51;hb=5dad5adb45ddd1f42c0e9e7c1d3cf7a0727f2ba5;hp=c5cfcb752809659ba37111ff826bc8e47c396f8a;hpb=2a48e93aa6f87832e212419f1268c78f06d4fb23;p=vserver-reference.git diff --git a/build.sh b/build.sh index c5cfcb7..e3e8489 100755 --- a/build.sh +++ b/build.sh @@ -40,16 +40,16 @@ shift $shiftcount # pldistro expected as $1 pldistro=$1 ; shift # The vserver reference name - this comes from spec's slicefamily -vrefname=$1; shift +slicefamily=$1; shift # Do not tolerate errors set -e # Path's to the vserver references images and stubs vrefdir=$PWD/vservers/.vref -vref=${vrefdir}/${vrefname} +vref=${vrefdir}/${slicefamily} # stubs are created in a subdir per slicefamily -vstubdir=$PWD/vservers/.vstub/${vrefname} +vstubdir=$PWD/vservers/.vstub/${slicefamily} # Make /vservers and default vserver reference image install -d -m 755 ${vref} @@ -85,7 +85,7 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null rm -f ${vdir}/var/lib/rpm/__db* # Communicate to the initialization script from which vref this stub was cloned - echo ${vrefname} > ${vdir}.cloned + echo ${slicefamily} > ${vdir}.cloned # Install the system vserver specific packages [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages @@ -135,4 +135,7 @@ postfile="${pkgsdir}/${pkgsname}.post" # switch the vserver reference /etc/yum.conf to the new one from the yum package [ -f ${vref}/etc/yum.conf.rpmnew ] && mv -f ${vref}/etc/yum.conf.rpmnew ${vref}/etc/yum.conf +# fix sudoers config +[ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers + exit 0