Support ssh for 3.22

Author: timower

Dockerfile

@@ -172,7 +172,7 @@ ARG fw_version
 RUN nix build "/src#\"rootfs-$fw_version\"" -o /run/rm-rootfs && \
     nix-collect-garbage
 
-FROM nix-rootfs AS nix-emu
+FROM nix-rootfs AS nix-emu:$fw_version
 
 ARG fw_version
 RUN nix build "/src#\"rm-emu-$fw_version\"" -o /result && \

nix/rootfs.nix

@@ -103,6 +103,13 @@
 
           ${lib.optionalString needsPatchDhcpcd "sed -i 's/wlan/eth/' /mnt/root/lib/systemd/system/dhcpcd.service"}
 
+          # 3.22 stopped shipping dropbear.socket on all interfaces.
+          if ! [ -e /mnt/root/lib/systemd/system/dropbear.socket ]; then
+            cp /mnt/root/lib/systemd/system/dropbear-usb0.socket /mnt/root/lib/systemd/system/dropbear.socket
+            sed -i 's/.*usb0.*//' /mnt/root/lib/systemd/system/dropbear.socket
+            ln -s /lib/systemd/system/dropbear.socket /mnt/root/etc/systemd/system/sockets.target.wants/
+          fi
+
           umount /mnt/root
 
           set +x