diff --git a/Template/Dockerfile.gen.oraclelinux b/Template/Dockerfile.gen.oraclelinux index f3fd36c..e5aa624 100644 --- a/Template/Dockerfile.gen.oraclelinux +++ b/Template/Dockerfile.gen.oraclelinux @@ -15,7 +15,7 @@ RUN ${PackageManager} install -y basesystem binutils bzip2 cpp createrepo dejavu RUN ${PackageManager} install -y net-snmp RUN ${PackageManager} install epel-release -y -RUN ${PackageManager} install screen modulemd-tools gettext -y +RUN ${PackageManager} install screen modulemd-tools gettext net-snmp-devel -y RUN mkdir /nfs RUN ln -s /data/repo /nfs/distributions diff --git a/bin/esl.fct b/bin/esl.fct index 30a12dc..bdeab83 100644 --- a/bin/esl.fct +++ b/bin/esl.fct @@ -61,9 +61,12 @@ function oraclelinux () { test -L /data/repo/OracleLinux/${osversion}/baseos/latest/x86_64 && Action "Delete Old Link" rm /data/repo/OracleLinux/${osversion}/baseos/latest/x86_64 Action "Create Dir ${osversion}" mkdir -p /data/repo/OracleLinux/${osversion}/baseos/latest - RunScreen baseos dnf reposync -g --newest-only --exclude='*.src' -p /data/repo/OracleLinux/${osversion}/baseos/latest --download-metadata --repoid=ol${Majeur}_u${Mineur}_baseos_base + RunScreen baseos dnf reposync -g --newest-only --exclude='*.src' -p /data/repo/OracleLinux/${osversion}/baseos/latest --download-metadata --repoid=ol${Majeur}_baseos_latest + #RunScreen baseos dnf reposync -g --newest-only --exclude='*.src' -p /data/repo/OracleLinux/${osversion}/baseos/latest --download-metadata --repoid=ol${Majeur}_u${Mineur}_baseos_base Download /data/repo/OracleLinux/${osversion}/baseos baseos Action "Get in ${osversion} baseos" cd /data/repo/OracleLinux/${osversion}/baseos/latest - Action "Link SeaNaps environement baseOS" ln -s ol${Majeur}_u${Mineur}_baseos_base x86_64 + #Action "Link SeaNaps environement baseOS" ln -s ol${Majeur}_u${Mineur}_baseos_base x86_64 + Action "Link SeaNaps environement baseOS" ln -s ol${Majeur}_baseos_latest x86_64 + } diff --git a/bin/gen.sh b/bin/gen.sh index ec6b703..7f59936 100755 --- a/bin/gen.sh +++ b/bin/gen.sh @@ -12,22 +12,24 @@ usage() { RmEnv() { rm -Rf ${Wai}/ESL/.Prefetch/ + rm -Rf ${Wai}/ESL/ESL_RPMS/.checksum rm -Rf ${Wai}/Workspace/* } Wai=/data/cible -[[ ! -d $Wai ]] && usage +[[ ! -d ${Wai}/ESL ]] && usage -cd ${Wai}/ESL/GenELMU/ -source ${Wai}/ESL/setenv.sh +#cd ${Wai}/ESL/GenELMU/ +#source ${Wai}/ESL/setenv.sh -[[ $1 == "del" ]] && RmEnv +#[[ $1 == "del" ]] && RmEnv +RmEnv [[ "$ESL_PROJECT" != "ESL" ]] && ProductElemu="i" -yes | ./ESL_Gen_ELMUs.sh -p${ProductElemu} +#yes | ./ESL_Gen_ELMUs.sh -p${ProductElemu} cd ${Wai}/ESL/GenOS/ ./ESL_Generate.sh