From 13a1d5c0bdb22fc69774131c606c07a9272227fa Mon Sep 17 00:00:00 2001 From: Emery Date: Tue, 23 Feb 2016 19:19:18 +0100 Subject: [PATCH] usbarmory: move to /inversepath, host support --- .../usbarmory}/configuration.nix | 0 .../usbarmory}/customKernel.config | 0 inversepath/usbarmory/host.nix | 35 +++++++++++++++++++ .../usbarmory}/usbarmory_dts.patch | 0 4 files changed, 35 insertions(+) rename {usbarmory => inversepath/usbarmory}/configuration.nix (100%) rename {usbarmory => inversepath/usbarmory}/customKernel.config (100%) create mode 100644 inversepath/usbarmory/host.nix rename {usbarmory => inversepath/usbarmory}/usbarmory_dts.patch (100%) diff --git a/usbarmory/configuration.nix b/inversepath/usbarmory/configuration.nix similarity index 100% rename from usbarmory/configuration.nix rename to inversepath/usbarmory/configuration.nix diff --git a/usbarmory/customKernel.config b/inversepath/usbarmory/customKernel.config similarity index 100% rename from usbarmory/customKernel.config rename to inversepath/usbarmory/customKernel.config diff --git a/inversepath/usbarmory/host.nix b/inversepath/usbarmory/host.nix new file mode 100644 index 0000000..eff7947 --- /dev/null +++ b/inversepath/usbarmory/host.nix @@ -0,0 +1,35 @@ +# +# Module for hosting the USB Armory +# + +{ ... }: + +let + staticDevName = "armory0"; +in + +{ + imports = [ ../../lib/hardware-notes.nix ]; + + hardwareNotes = + [ { title = "USB Armory network interface support"; + text = + '' - rename the Armory USB network interface + - set Armory inteface ip to 10.0.0.2/24 + - enable NAT and forward Armory interface + - add the name 'armory' to /etc/hosts + ''; + } + ]; + + services.udev.extraRules = + ''SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}"''; + # systemshit will probably still leave an a interface with a garbage name around + + networking = + { interfaces."${staticDevName}".ip4 = [{ address = "10.0.0.2"; prefixLength = 24; }]; + nat = { enable = true; internalInterfaces = [ staticDevName ]; }; + extraHosts = "10.0.0.1 armory"; + }; + +} diff --git a/usbarmory/usbarmory_dts.patch b/inversepath/usbarmory/usbarmory_dts.patch similarity index 100% rename from usbarmory/usbarmory_dts.patch rename to inversepath/usbarmory/usbarmory_dts.patch