X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=4c2ea6e1e539f7cc444a0ef90f1a771e9472d270;hb=e733b0545a632bea8536796f97ab3b266423aa16;hp=068e381231d3dd34a63fe2fb299152db87ebf07d;hpb=8404a0f3da559c3f32b8078fbf5ea317d40785f8;p=nodeimage.git diff --git a/build.sh b/build.sh index 068e381..4c2ea6e 100755 --- a/build.sh +++ b/build.sh @@ -38,8 +38,8 @@ shiftcount=$? shift $shiftcount # expecting fcdistro and pldistro on the command line -fcdistro=$1; shift pldistro=$1; shift +fcdistro=${pl_DISTRO_NAME} # Do not tolerate errors set -e @@ -58,7 +58,7 @@ pl_root_makedevs $vref pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs) # -k = exclude kernel* packages -pl_root_mkfedora -k -f $pkgsfile ${vref} +pl_root_mkfedora ${vref} ${pldistro} $pkgsfile # optionally invoke a post processing script after packages from # $pkgsfile have been installed @@ -75,8 +75,8 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc echo "--------START BUILDING bootstrapfs-${NAME}: $(date)" # "Parse" out the packages and groups for yum - packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs) - groups=$(pl_getGroups ${pl_DISTRO_NAME} $pkgs) + packages=$(pl_getPackages $fcdistro $pldistro $pkgs) + groups=$(pl_getGroups $fcdistro $pldistro $pkgs) echo "${NAME} has the following packages : ${packages}" echo "${NAME} has the following groups : ${groups}"