diff options
Diffstat (limited to 'core/modules/run-virt/data')
| l--------- | core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-dhcpd.service (renamed from core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-dhcpd.service) | 0 | ||||
| l--------- | core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-env.service (renamed from core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-env.service) | 0 | ||||
| -rw-r--r-- | core/modules/run-virt/data/etc/systemd/system/run-virt-env.service | 5 | ||||
| -rw-r--r-- | core/modules/run-virt/data/etc/tmpfiles.d/openslx-log.conf | 1 | ||||
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env | 8 |
5 files changed, 11 insertions, 3 deletions
diff --git a/core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-dhcpd.service b/core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-dhcpd.service index a47d9c0b..a47d9c0b 120000 --- a/core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-dhcpd.service +++ b/core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-dhcpd.service diff --git a/core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-env.service b/core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-env.service index c47218eb..c47218eb 120000 --- a/core/modules/run-virt/data/etc/systemd/system/graphical.target.wants/run-virt-env.service +++ b/core/modules/run-virt/data/etc/systemd/system/basic.target.wants/run-virt-env.service diff --git a/core/modules/run-virt/data/etc/systemd/system/run-virt-env.service b/core/modules/run-virt/data/etc/systemd/system/run-virt-env.service index 88b76789..2c602076 100644 --- a/core/modules/run-virt/data/etc/systemd/system/run-virt-env.service +++ b/core/modules/run-virt/data/etc/systemd/system/run-virt-env.service @@ -1,8 +1,9 @@ [Unit] Description=Sets up the virtualization environment Before=graphical.target system-check.service -Wants=network-dns.target system-check.service -After=network-dns.target +After=systemd-tmpfiles-setup.service bridge-additional-nics.service +Wants=systemd-tmpfiles-setup.service system-check.service bridge-additional-nics.service +DefaultDependencies=no [Service] Type=oneshot diff --git a/core/modules/run-virt/data/etc/tmpfiles.d/openslx-log.conf b/core/modules/run-virt/data/etc/tmpfiles.d/openslx-log.conf new file mode 100644 index 00000000..4d93fb9c --- /dev/null +++ b/core/modules/run-virt/data/etc/tmpfiles.d/openslx-log.conf @@ -0,0 +1 @@ +d /var/log/openslx 0777 root root diff --git a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env index 6b79d0ec..2a4d75da 100755 --- a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env +++ b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env @@ -24,6 +24,7 @@ ################################################################################ # source config file with vars (e.g. ipaddr, macaddr, HOSTNAME) +[ -s /opt/openslx/config ] || exit 0 . /opt/openslx/config # from plugins/vmchooser/XX_vmchooser.sh @@ -193,8 +194,13 @@ getips () { # Output in one line by using echo without quotes echo $(busybox timeout 2 nslookup "$1" 2>/dev/null | grep -A 4 '^Name:' | grep -E '^Address\s*[0-9]*: ' | awk -F': ' '{print $2}' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | awk '{print $1}') } - +getresolvconf() { + awk -vattr="$1" '$1 == attr {for (i=2; i<=NF; i++) printf "%s ",$i}' /etc/resolv.conf +} # read the DNS configuration and configure the udhcpd +SLX_DNS="$(getresolvconf nameserver)" +SLX_NET_DOMAIN="$(getresolvconf domain)" +SLX_NET_SEARCH="$(getresolvconf search)" [ -z "${SLX_DNS}" ] && SLX_DNS="8.8.8.8 8.8.4.4" [ -z "${SLX_NET_DOMAIN}" ] && SLX_NET_DOMAIN="$FALLBACK_DOMAIN" [ -z "${SLX_NET_SEARCH}" ] && SLX_NET_SEARCH="$FALLBACK_DOMAIN" |