lib/eval-config.nix

@@ -12,7 +12,6 @@ in
     "${modulesPath}/hardware.nix"
     "${modulesPath}/base.nix"
     "${modulesPath}/busybox.nix"
-    "${modulesPath}/iproute2.nix"
     "${modulesPath}/hostname.nix"
     "${modulesPath}/kernel"
     "${modulesPath}/s6"

modules/all-modules.nix

@@ -7,7 +7,6 @@
    ./base.nix
    ./bridge
    ./busybox.nix
-   ./iproute2.nix
    ./dhcp6c
    ./jitter-rng
    ./dnsmasq

modules/base.nix

@@ -130,7 +130,7 @@ in {
     nixpkgs.buildPlatform = lib.mkDefault builtins.currentSystem;
 
     defaultProfile.packages = with pkgs;
-      [ s6 s6-init-bin execline s6-linux-init s6-rc iproute2 ];
+      [ s6 s6-init-bin execline s6-linux-init s6-rc ];
     # Set the useful PS1 prompt by default.
     defaultProfile.environmentVariables.PS1 = lib.mkDefault config.defaultProfile.prompt;
 

modules/bridge/default.nix

@@ -9,7 +9,8 @@
 
 { lib, pkgs, config, ...}:
 let
-  inherit (lib) mkOption types mkEnableOption;
+  inherit (lib) mkOption types;
+  inherit (pkgs.liminix.services) oneshot;
   inherit (pkgs) liminix;
 in
 {
@@ -34,20 +35,6 @@ in
         default = null;
         description = "reuse mac address from an existing interface service";
       };
-
-      untagged = {
-        enable = mkEnableOption "untagged frames on port VID";
-        pvid = mkOption {
-          type = types.nullOr types.int;
-          default = null;
-          description = "Port VLAN ID for egress untagged frames";
-        };
-        default-pvid = mkOption {
-          type = types.int;
-          default = 0;
-          description = "Default PVID for ingress untagged frames, defaults to 0, which disable untagged frames for ingress";
-        };
-      };
     };
     members = config.system.callService ./members.nix {
       primary = mkOption {

modules/bridge/primary.nix

@@ -3,22 +3,17 @@
 , ifwait
 , lib
 }:
-{ ifname, macAddressFromInterface ? null, untagged } :
+{ ifname, macAddressFromInterface ? null } :
 let
-  inherit (liminix.services) oneshot;
+  inherit (liminix.services) bundle oneshot;
-  inherit (lib) optional optionalString;
+  inherit (lib) mkOption types optional;
-  # This enables vlan_filtering if we do make use of it.
-  extra = if untagged.enable then " vlan_filtering 1 vlan_default_pvid ${toString untagged.default-pvid}" else "";
 in oneshot rec {
   name = "${ifname}.link";
   up = ''
     ${if macAddressFromInterface == null then
-      "ip link add name ${ifname} type bridge${extra}"
+      "ip link add name ${ifname} type bridge"
       else
-      "ip link add name ${ifname} address $(output ${macAddressFromInterface} ether) type bridge${extra}"}
+      "ip link add name ${ifname} address $(output ${macAddressFromInterface} ether) type bridge"}
-
-      ${optionalString untagged.enable 
-        "bridge vlan add vid ${toString untagged.pvid} dev ${ifname} pvid untagged self"}
 
       (in_outputs ${name}
         echo ${ifname} > ifname

modules/busybox.nix

@@ -37,7 +37,7 @@ let
     "comm" "cp" "cpio" "cut" "date" "dhcprelay" "dd" "df" "dirname" "dmesg"
     "du" "echo" "egrep" "env" "expand" "expr" "false" "fdisk" "fgrep" "find"
     "free" "fuser" "grep" "gunzip" "gzip" "head" "hexdump" "hostname" "hwclock"
-    "ifconfig" "ipneigh" "kill"
+    "ifconfig" "ip" "ipaddr" "iplink" "ipneigh" "iproute" "iprule" "kill"
     "killall" "killall5" "less" "ln" "ls" "lsattr" "lsof" "md5sum" "mkdir"
     "mknod" "mktemp" "mount" "mv" "nc" "netstat" "nohup" "od" "pgrep" "pidof"
     "ping" "ping6" "pkill" "pmap" "printenv" "printf" "ps" "pwd" "readlink"

modules/iproute2.nix

@@ -1,28 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  inherit (lib) mkEnableOption mkPackageOption mkIf genAttrs;
-  inherit (pkgs.pseudofile) dir symlink;
-  cfg = config.programs.iproute2;
-  minimalPrograms = [
-    "ip"
-    "devlink"
-    "ss"
-    "bridge"
-    "genl"
-    "ifstat"
-    "nstat"
-  ];
-  links = genAttrs minimalPrograms (p: symlink "${cfg.package}/bin/${p}");
-in
-{
-  options.programs.iproute2 = {
-    enable = mkEnableOption "the iproute2 programs instead of busybox variants";
-    package = mkPackageOption pkgs "iproute2" { };
-  };
-
-  config = mkIf cfg.enable {
-    filesystem = dir {
-      bin = dir links;
-    };
-  };
-}

modules/outputs/initramfs.nix

@@ -54,7 +54,7 @@ in
             mount -t sysfs none /sys
             ${busybox}/bin/sh
           '';
-          refs = pkgs.writeClosure [ busybox ];
+          refs = pkgs.writeReferencesToFile busybox;
         in runCommand "initramfs.cpio" {} ''
           cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > out
           dir /proc 0755 0 0

modules/vlan/default.nix

@@ -33,11 +33,6 @@ in
       description = "VLAN identifier (VID) in range 1-4094";
       type = types.str;
     };
-    untagged.egress = mkOption {
-      description = "Whether packets from this interface will go out *untagged*";
-      type = types.bool;
-      default = false;
-    };
   };
   config.kernel.config = {
     VLAN_8021Q = "y";

modules/vlan/service.nix

@@ -2,15 +2,13 @@
   liminix
 , lib
 }:
-{ ifname, primary, vid, untagged } :
+{ ifname, primary, vid } :
 let
-  inherit (lib) optionalString;
   inherit (liminix.services) oneshot;
 in oneshot rec {
   name = "${ifname}.link";
   up = ''
     ip link add link $(output ${primary} ifname) name ${ifname} type vlan id ${vid}
-    ${optionalString untagged.egress "bridge vlan add dev ${ifname} vid ${toString untagged.vid} pvid untagged master"}
     ${liminix.networking.ifup name ifname}
     (in_outputs ${name}
      echo ${ifname} > ifname

overlay.nix

@@ -142,8 +142,6 @@ extraPkgs // {
            rev = "hostap-liminix-integration";
            hash = "sha256-5Xi90keCHxvuKR5Q7STuZDzuM9h9ac6aWoXVQYvqkQI=";
         };
-        # Do not take any patch.
-        patches = [];
         extraConfig = "";
         configurePhase = ''
           cat > hostapd/defconfig <<EOF
@@ -186,7 +184,6 @@ extraPkgs // {
            rev = "hostap-liminix-integration";
            hash = "sha256-5Xi90keCHxvuKR5Q7STuZDzuM9h9ac6aWoXVQYvqkQI=";
       };
-      patches = [];
       extraConfig = "";
       configurePhase = ''
         cat > hostapd/defconfig <<EOF
@@ -197,30 +194,6 @@ extraPkgs // {
     });
   in h.override { openssl = null; sqlite = null; };
 
-  libnl = prev.libnl.override {
-    graphviz = null;
-  };
-
-  iproute2 =
-  let i = prev.iproute2.overrideAttrs (old: {
-    postInstall = ''
-      ${(old.postInstall or "")}
-      non_necessary_binaries=("tc" "rdma" "dcb" "tipc" "vdpa")
-      for needless_binary in "''${non_necessary_binaries[@]}"; do
-        echo "Removing unnecessary binary $out/sbin/$needless_binary"
-        rm "$out/sbin/$needless_binary"
-      done
-      # No man
-      rm -rf "$out/share"
-      # Remove all the data about distributions for tc.
-      rm -rf "$out/lib"
-    '';
-  });
-  # Don't bring ebpf stuff to the table.
-  # We also remove tc so we can drop iptables as well.
-  # Let's try to kill `db` as well.
-  in i.override { elfutils = null; iptables = null; db = null; };
-
   wpa_supplicant = prev.wpa_supplicant.override {
     dbusSupport = false;
     withPcsclite = false;

pkgs/initramfs-peek/default.nix

@@ -3,7 +3,7 @@
 , pkgsBuildBuild
 , runCommand
 , cpio
-, writeClosure
+, writeReferencesToFile
 , writeScript
 } :
 let
@@ -18,7 +18,7 @@ let
     mount -t sysfs none /sys
     ${busybox}/bin/sh
   '';
-  refs = writeClosure [ busybox ];
+  refs = writeReferencesToFile busybox;
 in runCommand "initramfs.cpio" { } ''
   cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > out
   dir /proc 0755 0 0

pkgs/levitate/default.nix

@@ -2,7 +2,6 @@
   writeScriptBin
 , writeScript
 , systemconfig
-, stdenv
 , execline
 , lib
 , config ? {}
@@ -57,19 +56,11 @@ let
       };
       eval = lib.evalModules {
         modules = [
+          { _module.args = { inherit pkgs; inherit (pkgs) lim; }; }
           ../../modules/base.nix
           ../../modules/users.nix
           ../../modules/busybox.nix
-          ../../modules/hostname.nix
-          ../../modules/misc/assertions.nix
-          ../../modules/nixpkgs.nix
           base
-          {
-            # Inherit from that target system host platform.
-            nixpkgs.hostPlatform = stdenv.hostPlatform;
-            # Force our own package set.
-            nixpkgs.pkgs = lib.mkForce pkgs;
-          }
           ({ ... } : paramConfig)
           ../../modules/s6
         ];