Merge "allow building non-gentoo images on gentoo hosts"

2018-10-03 11:08:11 +00:00 · 2018-10-03 11:08:11 +00:00 · 3e6d658687
commit 3e6d658687
parent b86af3dc6a 2dd6dd357a
1 changed files with 4 additions and 2 deletions
--- a/diskimage_builder/elements/dib-init-system/dib-init-system
+++ b/diskimage_builder/elements/dib-init-system/dib-init-system
@ -14,8 +14,10 @@ if [ -f /usr/bin/systemctl -o -f /bin/systemctl ]; then
 elif [[ -f /sbin/initctl ]]; then
    echo "upstart"
 elif [[ -f /etc/gentoo-release ]]; then
-    if [[ "${GENTOO_PROFILE}" =~ systemd ]]; then
-        echo "systemd"
+    if [[ -z GENTOO_PROFILE ]]; then
+        if [[ "${GENTOO_PROFILE}" =~ systemd ]]; then
+            echo "systemd"
+        fi
    else
        echo "openrc"
    fi