From 03f8ca8da40dd26d0a2542fef51d28eb943d4442 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 10 Apr 2021 21:48:51 +0000
Subject: spectrumPackages.makeRootfs: move to default.nix

There is no default rootfs any more, so we might as well repurpose the
blessed filename.

Message-Id: <20210411115740.29615-14-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
---
 pkgs/os-specific/linux/spectrum/default.nix        |  2 +-
 pkgs/os-specific/linux/spectrum/rootfs/default.nix | 58 ++++++++++++++++++++++
 pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 58 ----------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 pkgs/os-specific/linux/spectrum/rootfs/default.nix
 delete mode 100644 pkgs/os-specific/linux/spectrum/rootfs/generic.nix

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix
index f8a9813d16a..7e07ee60f43 100644
--- a/pkgs/os-specific/linux/spectrum/default.nix
+++ b/pkgs/os-specific/linux/spectrum/default.nix
@@ -10,7 +10,7 @@ let
 
     linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; };
 
-    makeRootfs = callPackage ./rootfs/generic.nix { };
+    makeRootfs = callPackage ./rootfs { };
   };
 in
 self
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/default.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix
new file mode 100644
index 00000000000..56f2d15b103
--- /dev/null
+++ b/pkgs/os-specific/linux/spectrum/rootfs/default.nix
@@ -0,0 +1,58 @@
+{ runCommandNoCC, writeScript, writeReferencesToFile, makeFontsConf, lib
+, dash, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox
+, mesa, squashfs-tools-ng, makeDBusConf, connman
+}:
+
+{ services, rcServices ? {}, fonts ? [], path ? [] }:
+
+let
+  stage1 = import ./stage1.nix {
+    inherit writeScript lib
+      execline s6 s6-rc s6-portable-utils s6-linux-utils s6-linux-init busybox mesa
+      path;
+  };
+
+  makeServicesDir = import ./services.nix {
+    inherit runCommandNoCC writeScript lib execline;
+  };
+
+  makeRcServicesDir = import ./rc-services.nix {
+    inherit runCommandNoCC lib s6-rc;
+  };
+
+  fontsConf = makeFontsConf { fontDirectories = fonts; };
+
+  squashfs = runCommandNoCC "root-squashfs" {} ''
+    cd ${rootfs}
+    (
+        grep -v ^${rootfs} ${writeReferencesToFile rootfs}
+        printf "%s\n" *
+    ) \
+        | xargs tar -cP --owner root:0 --group root:0 --hard-dereference \
+        | ${squashfs-tools-ng}/bin/tar2sqfs -c gzip -X level=1 $out
+  '';
+
+  rootfs = runCommandNoCC "rootfs" { passthru = { inherit squashfs; }; } ''
+    mkdir $out
+    cd $out
+
+    mkdir -p bin sbin dev proc run sys tmp var/lib
+    ln -s /run var/run
+    ln -s ${dash}/bin/dash bin/sh
+    ln -s ${stage1} sbin/init
+    cp -r ${./etc} etc
+    chmod u+w etc
+    ln -s ${makeDBusConf {
+      suidHelper = "/run/dbus-daemon-launch-helper";
+      serviceDirectories = [ connman ];
+    }} etc/dbus-1
+
+    mkdir etc/fonts
+    ln -s ${fontsConf} etc/fonts/fonts.conf
+
+    touch etc/login.defs
+    cp -r ${makeServicesDir { inherit services; }} etc/service
+    cp -r ${makeRcServicesDir { services = rcServices; }} etc/s6-rc
+  '';
+in
+rootfs
diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
deleted file mode 100644
index 56f2d15b103..00000000000
--- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ runCommandNoCC, writeScript, writeReferencesToFile, makeFontsConf, lib
-, dash, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox
-, mesa, squashfs-tools-ng, makeDBusConf, connman
-}:
-
-{ services, rcServices ? {}, fonts ? [], path ? [] }:
-
-let
-  stage1 = import ./stage1.nix {
-    inherit writeScript lib
-      execline s6 s6-rc s6-portable-utils s6-linux-utils s6-linux-init busybox mesa
-      path;
-  };
-
-  makeServicesDir = import ./services.nix {
-    inherit runCommandNoCC writeScript lib execline;
-  };
-
-  makeRcServicesDir = import ./rc-services.nix {
-    inherit runCommandNoCC lib s6-rc;
-  };
-
-  fontsConf = makeFontsConf { fontDirectories = fonts; };
-
-  squashfs = runCommandNoCC "root-squashfs" {} ''
-    cd ${rootfs}
-    (
-        grep -v ^${rootfs} ${writeReferencesToFile rootfs}
-        printf "%s\n" *
-    ) \
-        | xargs tar -cP --owner root:0 --group root:0 --hard-dereference \
-        | ${squashfs-tools-ng}/bin/tar2sqfs -c gzip -X level=1 $out
-  '';
-
-  rootfs = runCommandNoCC "rootfs" { passthru = { inherit squashfs; }; } ''
-    mkdir $out
-    cd $out
-
-    mkdir -p bin sbin dev proc run sys tmp var/lib
-    ln -s /run var/run
-    ln -s ${dash}/bin/dash bin/sh
-    ln -s ${stage1} sbin/init
-    cp -r ${./etc} etc
-    chmod u+w etc
-    ln -s ${makeDBusConf {
-      suidHelper = "/run/dbus-daemon-launch-helper";
-      serviceDirectories = [ connman ];
-    }} etc/dbus-1
-
-    mkdir etc/fonts
-    ln -s ${fontsConf} etc/fonts/fonts.conf
-
-    touch etc/login.defs
-    cp -r ${makeServicesDir { inherit services; }} etc/service
-    cp -r ${makeRcServicesDir { services = rcServices; }} etc/s6-rc
-  '';
-in
-rootfs
-- 
cgit 1.4.1