Merge branch 'udev' into development

Author: simonwalz

system/cuos/init.sh

@@ -424,6 +424,101 @@ configure_network() {
 
 }
 
+configure_udev() {
+  local rules_file="${T_FILE_UDEV_RULES:-/etc/udev/rules.d/99-cuos.rules}"
+  local rules_file_new="${T_FILE_UDEV_RULES_NEW:-"${rules_file}.new"}"
+
+  local count
+  count="$(jq_config '.udev | length')"
+
+  {
+    echo "# Managed automatically"
+    echo
+
+    for ((i=0; i<count; i++)); do
+      local entry
+      entry="$(jq_config -c ".udev[$i]")"
+
+      # --- unified field extraction (old + new schema) ---
+      local subsystem vendor product serial mac symlink
+
+      subsystem="$(echo "$entry" | jq -r '.subsystem // .match.subsystem // empty')"
+      symlink="$(echo "$entry"   | jq -r '.symlink // empty')"
+
+      vendor="$(echo "$entry"  | jq -r '.vendor // .match.vendor // empty')"
+      product="$(echo "$entry" | jq -r '.product // .match.product // empty')"
+      serial="$(echo "$entry"  | jq -r '.serial // .match.serial // empty')"
+      mac="$(echo "$entry"     | jq -r '."mac-address" // .match."mac-address" // empty' | tr '[:upper:]' '[:lower:]')"
+
+      mode="$(echo "$entry" | jq -r '.mode // empty')"
+      tag="$(echo "$entry" | jq -r '.tag // empty')"
+
+      # skip invalid entries
+      [[ -z "$subsystem" || -z "$symlink" ]] && continue
+
+      local rule=""
+      rule+="SUBSYSTEM==\"${subsystem}\""
+
+      case "$subsystem" in
+        tty)
+          [[ -n "$serial" ]]  && rule+=", ATTRS{serial}==\"${serial}\""
+          [[ -n "$vendor" ]]  && rule+=", ATTRS{idVendor}==\"${vendor}\""
+          [[ -n "$product" ]] && rule+=", ATTRS{idProduct}==\"${product}\""
+          ;;
+
+        hidraw)
+          [[ -n "$vendor" ]]  && rule+=", ATTRS{idVendor}==\"${vendor}\""
+          [[ -n "$product" ]] && rule+=", ATTRS{idProduct}==\"${product}\""
+          [[ -n "$serial" ]]  && rule+=", ATTRS{serial}==\"${serial}\""
+          ;;
+
+        sound)
+          [[ -n "$vendor" ]]  && rule+=", ATTRS{idVendor}==\"${vendor}\""
+          [[ -n "$product" ]] && rule+=", ATTRS{idProduct}==\"${product}\""
+          ;;
+
+        block)
+          [[ -n "$serial" ]] && rule+=", ATTRS{serial}==\"${serial}\""
+          [[ -n "$vendor" ]] && rule+=", ATTRS{idVendor}==\"${vendor}\""
+          [[ -n "$product" ]] && rule+=", ATTRS{idProduct}==\"${product}\""
+          ;;
+
+        net)
+          [[ -n "$mac" ]] && rule+=", ATTR{address}==\"${mac}\""
+          ;;
+      esac
+
+      [[ -n "$mode" ]] && rule+=", MODE=\"${mode}\""
+      [[ -n "$tag" ]] && rule+=", TAG+=\"${tag}\""
+
+      rule+=", SYMLINK+=\"${symlink}\""
+
+      echo "$rule"
+    done
+  } > "${rules_file_new}"
+
+  # --- atomic replace ---
+  if [[ -n "${TEST:-}" ]]; then
+    return
+  fi
+
+  local changed=1
+
+  if [[ -f "${rules_file}" ]]; then
+    if [[ "$(sha256sum "${rules_file}" | cut -d ' ' -f1)" == \
+          "$(sha256sum "${rules_file_new}" | cut -d ' ' -f1)" ]]; then
+      changed=0
+    fi
+  fi
+
+  mv "${rules_file_new}" "${rules_file}"
+
+  if (( changed )); then
+    udevadm control --reload-rules
+    udevadm trigger
+  fi
+}
+
 configure_keyboard() {
   # For lxc we do not configure the keyboard
   if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
@@ -762,6 +857,8 @@ main() {
 
   ensure_system_config
 
+  configure_udev
+
   set_hostname
 
   configure_network

system/cuos/init.test.sh

@@ -132,4 +132,14 @@ expect \
   $'auto lo\niface lo inet loopback\n\nauto eth0\niface eth0 inet dhcp\n    metric 100\n\niface eth1 inet manual' \
   configure_network
 
+
+export T_FILE_UDEV_RULES_NEW=/dev/stdout
+export T_FILE_UDEV_RULES=/dev/stdout
+
+export CONFIG_PATH="${SCRIPT_DIR}/init.test.system6.json"
+expect \
+  "configure_udev: no config found" \
+  $'# Managed automatically\n\nSUBSYSTEM=="tty", ATTRS{serial}=="A50285BI", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", MODE="0660", TAG+="iot", SYMLINK+="zigbee"\nSUBSYSTEM=="sound", ATTRS{idVendor}=="0499", ATTRS{idProduct}=="1503", MODE="0660", TAG+="audio", SYMLINK+="midi-keyboard"\nSUBSYSTEM=="hidraw", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c216", MODE="0660", TAG+="input", SYMLINK+="gamepad"\nSUBSYSTEM=="block", ATTRS{serial}=="4C530001230101118392", MODE="0660", TAG+="storage", SYMLINK+="backup-disk"\nSUBSYSTEM=="net", ATTR{address}=="02:11:22:33:44:55", MODE="0660", SYMLINK+="usbip-nic"' \
+  configure_udev
+
 summary

system/cuos/init.test.system6.json

@@ -0,0 +1,49 @@
+{
+  "udev": [
+    {
+      "name": "zigbee-serial",
+      "subsystem": "tty",
+      "vendor": "1a86",
+      "product": "7523",
+      "serial": "A50285BI",
+      "symlink": "zigbee",
+      "mode": "0660",
+      "tag": "iot"
+    },
+    {
+      "name": "usb-midi",
+      "subsystem": "sound",
+      "vendor": "0499",
+      "product": "1503",
+      "symlink": "midi-keyboard",
+      "mode": "0660",
+      "tag": "audio"
+    },
+    {
+      "name": "usb-hid-gamepad",
+      "subsystem": "hidraw",
+      "vendor": "046d",
+      "product": "c216",
+      "symlink": "gamepad",
+      "mode": "0660",
+      "tag": "input"
+    },
+    {
+      "name": "usb-storage",
+      "subsystem": "block",
+      "serial": "4C530001230101118392",
+      "symlink": "backup-disk",
+      "mode": "0660",
+      "tag": "storage"
+    },
+    {
+      "name": "usbip-nic",
+      "subsystem": "net",
+      "vendor": "0bda",
+      "product": "8153",
+      "mac-address": "02:11:22:33:44:55",
+      "symlink": "usbip-nic",
+      "mode": "0660"
+    }
+  ]
+}