From 7708ed211769489f24dc2e220220db934ce7a3fe Mon Sep 17 00:00:00 2001 From: "Andrew A. Vasilyev" Date: Sat, 16 May 2020 17:22:01 +0300 Subject: [PATCH] F #-: add ALT Linux support This commit adds support for ALT Linux lxd containers images from Linux Containers Market. Signed-off-by: Andrew A. Vasilyev --- src/datastore_mad/remotes/lxd_downloader.sh | 23 +++++++++++++++++++ .../remotes/linuxcontainers/monitor | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/datastore_mad/remotes/lxd_downloader.sh b/src/datastore_mad/remotes/lxd_downloader.sh index 90e00ea2c2..779ff6936e 100755 --- a/src/datastore_mad/remotes/lxd_downloader.sh +++ b/src/datastore_mad/remotes/lxd_downloader.sh @@ -36,6 +36,7 @@ MARKET_URL=$1 CONTEXT_API="https://api.github.com/repos/OpenNebula/addon-context-linux/releases" CONTEXT_URL="https://github.com/OpenNebula/addon-context-linux/releases/download" +PKG_ALT="curl openssh-server" PKG_APK="curl openssh" PKG_DEB="curl dbus openssh-server" PKG_RPM="openssh-server" @@ -290,6 +291,28 @@ $CURL $CONTEXT_URL/v$selected_tag/one-context-$selected_tag-r1.apk -Lsfo /root/c apk add --allow-untrusted /root/context.apk >> /var/log/chroot.log 2>&1 rm /root/context.apk +rm /dev/random /dev/urandom +EOC +) + ;; +*alt*) + terminal="/bin/bash" + commands=$(cat <> /var/log/chroot.log 2>&1 +echo "nameserver $DNS_SERVER" > /etc/resolv.conf + +[ ! -e /dev/random ] && mknod -m 666 /dev/random c 1 8 >> /var/log/chroot.log 2>&1 +[ ! -e /dev/urandom ] && mknod -m 666 /dev/urandom c 1 9 >> /var/log/chroot.log 2>&1 + +apt-get update >> /var/log/chroot.log 2>&1 +apt-get install $PKG_ALT -y >> /var/log/chroot.log 2>&1 + +$CURL $CONTEXT_URL/v$selected_tag/one-context-$selected_tag-alt1.noarch.rpm -Lsfo /root/context.rpm >> /var/log/chroot.log 2>&1 +apt-get install /root/context.rpm -y >> /var/log/chroot.log 2>&1 +rm /root/context.rpm + rm /dev/random /dev/urandom EOC ) diff --git a/src/market_mad/remotes/linuxcontainers/monitor b/src/market_mad/remotes/linuxcontainers/monitor index f9076c98f1..ecd37ec981 100755 --- a/src/market_mad/remotes/linuxcontainers/monitor +++ b/src/market_mad/remotes/linuxcontainers/monitor @@ -38,7 +38,7 @@ class LinuxContainersMarket :fs => 'ext4', :format => 'raw', :agent => 'OpenNebula', - :tested_apps => %w[alpine centos debian ubuntu fedora devuan], + :tested_apps => %w[alpine alt centos debian ubuntu fedora devuan], :skip_untested => 'yes' }