diff --git a/os/alma/8/Vagrantfile b/os/alma/8/Vagrantfile index 29582e6..f9238c4 100644 --- a/os/alma/8/Vagrantfile +++ b/os/alma/8/Vagrantfile @@ -52,8 +52,7 @@ Vagrant.configure("2") do |config| useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd - cd ./rublon_ssh-build - yum install -y rublon*.rpm + yum install -y ${BUILDDIR}/rublon*.rpm SHELL end diff --git a/os/alma/9/Vagrantfile b/os/alma/9/Vagrantfile index 867006f..a77d5dc 100644 --- a/os/alma/9/Vagrantfile +++ b/os/alma/9/Vagrantfile @@ -51,7 +51,7 @@ Vagrant.configure("2") do |config| cmake --build ${BUILDDIR} -j$(nproc) cmake --build ${BUILDDIR} --target package -j$(nproc) - yum install -y ./rublon_ssh-build/rublon* + yum install -y ${BUILDDIR}/rublon* useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd SHELL diff --git a/os/centos/stream9/Vagrantfile b/os/centos/stream9/Vagrantfile index 1b72d91..05894e3 100755 --- a/os/centos/stream9/Vagrantfile +++ b/os/centos/stream9/Vagrantfile @@ -37,7 +37,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL export BASE=/home/vagrant/Rublon-Linux export DISTRO=centos09 - export BUILDDIR=${BASE}/${DISTRO} + export BUILDDIR=/home/vagrant/${DISTRO} yum update yum install -y gcc gcc-c++ openssl-devel libcurl-devel pam-devel cmake policycoreutils-devel checkpolicy rpm-build openssh @@ -47,12 +47,12 @@ Vagrant.configure("2") do |config| # build package cmake -B ${BUILDDIR} ${BASE} - cmake --build ${BUILDDIR} -j$(nproc) + cmake --build ${BUILDDIR} -j$(nproc)y cmake --build ${BUILDDIR} --target package -j$(nproc) useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd - sudo yum install -y ./rublon_ssh-build/rublon*.rpm + sudo yum install -y ${BUILDDIR}/rublon*.rpm SHELL end diff --git a/os/opensuse/15sp3/Vagrantfile b/os/opensuse/15sp3/Vagrantfile index 6e0f715..ca3437b 100644 --- a/os/opensuse/15sp3/Vagrantfile +++ b/os/opensuse/15sp3/Vagrantfile @@ -37,7 +37,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL export BASE=/home/vagrant/Rublon-Linux export DISTRO=opensuse15 - export BUILDDIR=${BASE}/${DISTRO} + export BUILDDIR=/home/vagrant/${DISTRO} zypper --non-interactive install -y \ gcc \ gcc-c++ \ @@ -60,6 +60,6 @@ Vagrant.configure("2") do |config| # Register Rublon pam useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd - sudo zypper --no-gpg-checks install -y ${BUILDDIR}/rublon_ssh-build/rublon* + sudo zypper --no-gpg-checks install -y ${BUILDDIR}/rublon* SHELL end diff --git a/os/rhel/8/Vagrantfile b/os/rhel/8/Vagrantfile index e3672b7..35252e5 100644 --- a/os/rhel/8/Vagrantfile +++ b/os/rhel/8/Vagrantfile @@ -53,7 +53,7 @@ Vagrant.configure("2") do |config| cmake --build ${BUILDDIR} --target package -j$(nproc) # Register Rublon pam - yum -y install ./rublon_ssh-build/rublon-ssh*.el8.rpm + yum -y install ${BUILDDIR}/rublon-ssh*.el8.rpm useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd diff --git a/os/rhel/9/Vagrantfile b/os/rhel/9/Vagrantfile index ebf27f7..ce86f1f 100755 --- a/os/rhel/9/Vagrantfile +++ b/os/rhel/9/Vagrantfile @@ -54,7 +54,7 @@ Vagrant.configure("2") do |config| # Register Rublon pam useradd -s /bin/bash -m bwi echo "bwi:bwi"|chpasswd - yum -y install ./rublon_ssh-build/rublon*.rpm + yum -y install ${BUILDDIR}/rublon*.rpm SHELL end