v2.5.2

intel · Jul 1, 2022 · be7de3d · be7de3d
1 parent a992c64
commit be7de3d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -166,6 +166,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.5.2] - 2022-06-30
 ### Changed
 - Fixed Linuxkit compiling on Ubuntu 22.04
+- Fixed net detection for Ubuntu 22.04
 - Fixed Miscellaneous bugs
 
 

diff --git a/build.sh b/build.sh
@@ -220,12 +220,22 @@ getSecretInfo
 
 source "scripts/templateutils.sh"
 
-if [[ ! -z "${builder_config_dynamic_profile_enabled+x}" ]];then
+if [[ ! -z "${builder_config_dynamic_profile_enabled+x}" ]]; then
     if [[ "${builder_config_dynamic_profile_enabled}" == "true" ]]; then
         export DYNAMIC_PROFILE="true"
     fi
 fi
 
+if [[ ! -z "${builder_config_interface+x}" ]]; then
+    ifaceConfig=$(ip a show dev ${builder_config_interface} 2>&1)
+    if [[ ${ifaceConfig} == *"does not exist"* ]]; then
+        printErrMsg "The config.yml 'interface' device '${builder_config_interface}' does not exist"
+        # Remove build lock
+        rm conf/.build.lock 2>/dev/null
+        exit
+    fi
+fi
+
 # Incorporate proxy preferences
 if [ "${HTTP_PROXY+x}" != "" ] && [ "${http_proxy+x}" == "" ]; then
     export http_proxy=${HTTP_PROXY}

diff --git a/scripts/buildUOS.sh b/scripts/buildUOS.sh
@@ -65,12 +65,10 @@ if podman -v >/dev/null 2>&1; then
             rm -fr /tmp/builder && \
             mkdir -p /tmp/builder && \
             mkdir -p $(pwd)/lib/docker && \
+            if [ ! -d '/sys/fs/cgroup/systemd' ]; then mkdir /sys/fs/cgroup/systemd && mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd; fi && \
             docker run -d --privileged --name builder-docker ${DOCKER_RUN_ARGS} -v /tmp/builder:/var/run -v $(pwd)/lib/docker:/var/lib/docker docker:19.03.12-dind && \
             sleep 10 && \
-            docker exec -t builder-docker sh -c '\
-                mkdir /sys/fs/cgroup/systemd && \
-                mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd \
-            ' && \
+            docker exec -t builder-docker sh -c 'if [ ! -d \"/sys/fs/cgroup/systemd\" ]; then mkdir /sys/fs/cgroup/systemd && mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd; fi' && \
             docker run -t --rm --privileged ${DOCKER_RUN_ARGS} -v $(pwd):/uos -v /tmp/builder:/var/run -v /tmp/host-builder:/tmp/host-docker docker:19.03.12-dind sh -c '\
                 apk update && apk add --no-cache \
                     alpine-sdk \
@@ -114,13 +112,11 @@ else
             fi; \
             docker rm -f builder-docker >/dev/null 2>&1; \
             rm -fr /tmp/builder && \
+            if [ ! -d '/sys/fs/cgroup/systemd' ]; then mkdir /sys/fs/cgroup/systemd && mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd; fi && \
             docker run -d --privileged --name builder-docker ${DOCKER_RUN_ARGS} -v /tmp/builder:/var/run -v $(pwd)/lib/docker:/var/lib/docker docker:19.03.12-dind && \
             echo 'Waiting for Docker'; \
             while (! docker -H unix:////tmp/builder/docker.sock ps > /dev/null 2>&1); do echo -n '.'; sleep 0.5; done; echo 'ready' && \
-            docker exec -t builder-docker sh -c '\
-                mkdir /sys/fs/cgroup/systemd && \
-                mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd \
-            ' && \
+            docker exec -t builder-docker sh -c 'if [ ! -d \"/sys/fs/cgroup/systemd\" ]; then mkdir /sys/fs/cgroup/systemd && mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd; fi' && \
             docker run -t ${DOCKER_RUN_ARGS} --rm -v $(pwd):/uos -v /tmp/builder:/var/run -v /var/run:/tmp/host-docker docker:19.03.12-dind sh -c '\
                 apk update && apk add --no-cache \
                     alpine-sdk \

diff --git a/scripts/templateutils.sh b/scripts/templateutils.sh
@@ -17,23 +17,29 @@ getMyIp() {
     if [[ -z "${builder_config_interface+x}" ]]; then
         echo $(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++) if ($i=="src") print $(i+1)}')
     else
-        echo $(ip route |grep ${builder_config_interface} |grep src |awk '{for(i=1;i<=NF;i++) if ($i=="src") print $(i+1)}')
+        echo $(ip a show dev ${builder_config_interface} | grep "inet " | awk '$1 ~ /^inet/ { sub("/.*", "", $2); print $2 }')
     fi
 }
 
 getMyDefaultRoute() {
     if [[ -z "${builder_config_interface+x}" ]]; then
         echo $(ip route show | grep -i 'default via'| awk '{print $3 }')
     else
-        echo $(ip route show |grep ${builder_config_interface} |grep src | awk '{print $9}')
+        ifDefaultRoute=$(ip route show dev ${builder_config_interface} | grep -i 'default via'| awk '{print $3 }')
+        if [[ -z "${ifDefaultRoute=x}" ]]; then
+            # if no route is set for this interface then use the IP Address for this interface
+            echo $(getMyIp)
+        else
+            echo ${ifDefaultRoute}
+        fi
     fi
 }
 
 getMyBroadcast() {
     if [[ -z "${builder_config_interface+x}" ]]; then
-        echo $(ip -o -4 addr list $(ip route show 0.0.0.0/0 | awk '{print $5}') | grep brd |  awk '{print $6}')
+        echo $(ip -o -4 addr list $(ip route show 0.0.0.0/0 | awk '{print $5}') | grep brd | sed -e 's/^.* brd \([0-9\.]*\) .*$/\1/' )
     else
-        echo $(ip -o -4 addr list ${builder_config_interface} |grep brd | awk '{print $6}')
+        echo $(ip -o -4 addr list ${builder_config_interface} | grep brd | sed -e 's/^.* brd \([0-9\.]*\) .*$/\1/')
     fi
 }