fix: Set network flag (#1075)

src/config.sh

@@ -12,92 +12,4 @@ DEV_OPTS+=" -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
 ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $DEV_OPTS $ARGUMENTS"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 
-# Check available memory as the very last step
-
-RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
-  
-if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
-
-  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
-
-  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-    msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available,"
-    if [[ "${FS,,}" == "zfs" ]]; then
-      info "$msg but since ZFS is active this will be ignored."
-    else
-      RAM_SIZE="max"
-      warn "$msg it will automatically be adjusted to a lower amount."
-    fi
-  else
-    if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
-      msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of memory available,"
-      if [[ "${FS,,}" == "zfs" ]]; then
-        info "$msg but since ZFS is active this will be ignored."
-      else
-        warn "$msg please consider a lower amount."
-      fi
-    fi
-  fi
-
-fi
-
-if [[ "${RAM_SIZE,,}" == "half" ]]; then
-
-  RAM_WANTED=$(( RAM_AVAIL / 2 ))
-  RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
-
-  if (( "$RAM_WANTED" < 1 )); then
-    RAM_WANTED=$(( RAM_AVAIL / 2 ))
-    RAM_WANTED=$(( RAM_WANTED / 1048577 ))
-    RAM_SIZE="${RAM_WANTED}M"
-  else
-    RAM_SIZE="${RAM_WANTED}G"
-  fi
-
-fi
-
-if [[ "${RAM_SIZE,,}" == "max" ]]; then
-
-  RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 3) ))
-  RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
-
-  if (( "$RAM_WANTED" < 1 )); then
-
-    RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 2) ))
-    RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
-
-    if (( "$RAM_WANTED" < 1 )); then
-
-      RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
-      RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
-
-      if (( "$RAM_WANTED" < 1 )); then
-  
-        RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
-        RAM_WANTED=$(( RAM_WANTED / 1048577 ))
-  
-        if (( "$RAM_WANTED" < 1 )); then
-
-          RAM_WANTED=$(( RAM_AVAIL ))
-          RAM_WANTED=$(( RAM_WANTED / 1048577 ))
-            
-        fi
-
-        RAM_SIZE="${RAM_WANTED}M"
-      else
-        RAM_SIZE="${RAM_WANTED}G"
-      fi
-    else
-      RAM_SIZE="${RAM_WANTED}G"
-    fi
-  else
-    RAM_SIZE="${RAM_WANTED}G"
-  fi
-  
-fi
-
-if [[ "$DEBUG" == [Yy1]* ]]; then
-  printf "QEMU arguments:\n\n%s\n\n" "${ARGS// -/$'\n-'}"
-fi
-
 return 0

src/disk.sh

@@ -432,11 +432,18 @@ addDisk () {
   DIR=$(dirname "$DISK_FILE")
   [ ! -d "$DIR" ] && return 0
 
-  if [[ "${DISK_SPACE,,}" == "max" ]]; then
+  if [[ "${DISK_SPACE,,}" == "max" || "${DISK_SPACE,,}" == "half" ]]; then
 
-    local SPARE=536870912
+    local SPARE=2147483648
     SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
-    (( SPACE < SPARE )) && SPACE="$SPARE" || SPACE=$((SPACE-SPARE))
+
+    if [[ "${DISK_SPACE,,}" == "max" ]]; then
+      SPACE=$((SPACE-SPARE))
+    else
+      SPACE=$(( SPACE / 2 ))
+    fi
+
+    (( SPACE < SPARE )) && SPACE="$SPARE" 
     GB=$(( SPACE/1073741825 ))
     DISK_SPACE="${GB}G"
 

src/entry.sh

@@ -19,6 +19,8 @@ cd /run
 . serial.sh     # Initialize serialport
 . power.sh      # Configure shutdown
 . config.sh     # Configure arguments
+. memory.sh     # Check available memory
+. finish.sh     # Finish initialization
 
 trap - ERR
 

src/finish.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [[ "$DEBUG" == [Yy1]* ]]; then
+  printf "QEMU arguments:\n\n%s\n\n" "${ARGS// -/$'\n-'}"
+fi
+
+return 0

src/memory.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
+  
+if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then
+
+  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
+
+  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+    msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available,"
+    if [[ "${FS,,}" == "zfs" ]]; then
+      info "$msg but since ZFS is active this will be ignored."
+    else
+      RAM_SIZE="max"
+      warn "$msg it will automatically be adjusted to a lower amount."
+    fi
+  else
+    if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
+      msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of memory available,"
+      if [[ "${FS,,}" == "zfs" ]]; then
+        info "$msg but since ZFS is active this will be ignored."
+      else
+        warn "$msg please consider a lower amount."
+      fi
+    fi
+  fi
+
+fi
+
+if [[ "${RAM_SIZE,,}" == "half" ]]; then
+
+  RAM_WANTED=$(( RAM_AVAIL / 2 ))
+  RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
+
+  if (( "$RAM_WANTED" < 1 )); then
+    RAM_WANTED=$(( RAM_AVAIL / 2 ))
+    RAM_WANTED=$(( RAM_WANTED / 1048577 ))
+    RAM_SIZE="${RAM_WANTED}M"
+  else
+    RAM_SIZE="${RAM_WANTED}G"
+  fi
+
+fi
+
+if [[ "${RAM_SIZE,,}" == "max" ]]; then
+
+  RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 3) ))
+  RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
+
+  if (( "$RAM_WANTED" < 1 )); then
+
+    RAM_WANTED=$(( RAM_AVAIL - (RAM_SPARE * 2) ))
+    RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
+
+    if (( "$RAM_WANTED" < 1 )); then
+
+      RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
+      RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
+
+      if (( "$RAM_WANTED" < 1 )); then
+  
+        RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE ))
+        RAM_WANTED=$(( RAM_WANTED / 1048577 ))
+  
+        if (( "$RAM_WANTED" < 1 )); then
+
+          RAM_WANTED=$(( RAM_AVAIL ))
+          RAM_WANTED=$(( RAM_WANTED / 1048577 ))
+            
+        fi
+
+        RAM_SIZE="${RAM_WANTED}M"
+      else
+        RAM_SIZE="${RAM_WANTED}G"
+      fi
+    else
+      RAM_SIZE="${RAM_WANTED}G"
+    fi
+  else
+    RAM_SIZE="${RAM_WANTED}G"
+  fi
+  
+fi
+
+return 0

src/network.sh

@@ -271,6 +271,7 @@ getSlirp() {
 
 configureSlirp() {
 
+  NETWORK="slirp"
   [[ "$DEBUG" == [Yy1]* ]] && echo "Configuring slirp networking..."
 
   local ip="$IP"
@@ -302,6 +303,7 @@ configureSlirp() {
 
 configurePasst() {
 
+  NETWORK="passt"
   [[ "$DEBUG" == [Yy1]* ]] && echo "Configuring user-mode networking..."
 
   local log="/var/log/passt.log"
@@ -785,7 +787,7 @@ else
   fi
 
   case "${NETWORK,,}" in
-    "user"* | "passt" | "slirp" ) ;;
+    "passt" | "slirp" | "user"* ) ;;
     "tap" | "tun" | "tuntap" | "y" )
 
       # Configure tap interface
@@ -800,11 +802,9 @@ else
 
   esac
 
-  [[ "${NETWORK,,}" == "user"* ]] && NETWORK="passt"
-
   case "${NETWORK,,}" in
     "tap" | "tun" | "tuntap" | "y" ) ;;
-    "passt" )
+    "passt" | "user"* )
 
       # Configure for user-mode networking (passt)
       if ! configurePasst; then

src/reset.sh

@@ -59,6 +59,8 @@ fi
 
 CPU_CORES="${CPU_CORES// /}"
 [[ "${CPU_CORES,,}" == "max" ]] && CPU_CORES="$CORES"
+[[ "${CPU_CORES,,}" == "half" ]] && CPU_CORES=$(( CORES / 2 ))
+[[ "${CPU_CORES,,}" == "0" ]] && CPU_CORES="1"
 [ -n "${CPU_CORES//[0-9 ]}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
 
 if [ "$CPU_CORES" -gt "$CORES" ]; then