mobile-nixos · Jan 10, 2020 · Jan 10, 2020 · Jan 10, 2020 · Jan 11, 2020
Showing with 25 additions and 37 deletions.

+2 −13 modules/initrd-base.nix

+22 −0 overlay/hardshutdown/default.nix

+0 −11 overlay/misc/hard-reboot.nix

+0 −11 overlay/misc/hard-shutdown.nix

+1 −2 overlay/overlay.nix
diff --git a/modules/initrd-base.nix b/modules/initrd-base.nix
@@ -6,20 +6,9 @@ let
   cfg = config.mobile.boot.stage-1;
 in
 {
-  options.mobile.boot.stage-1.hard-reboot = {
-    enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Adds hard-reboot/hard-shutdown script.
-      '';
-    };
-  };
-
   config.mobile.boot.stage-1 = {
-    extraUtils = with pkgs; lib.mkIf cfg.hard-reboot.enable [
-      hard-reboot 
-      hard-shutdown
+    extraUtils = with pkgs; [
+      hardshutdown
     ];
   };
 }
diff --git a/overlay/hardshutdown/default.nix b/overlay/hardshutdown/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "hardshutdown";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "mobile-nixos";
+    repo = "hardshutdown";
+    rev = "6beb4b77b273bbd045870ecd8de8630b5007451b";
+    sha256 = "0vxflpfx8dr5rzr9y6hm0zv7jxcc3sgisqvkyicwzg8mvl2vfshi";
+  };
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Single-call binary handling shutdown/reboot syscalls";
+    license = licenses.gpl2;
+  };
+}
diff --git a/overlay/misc/hard-reboot.nix b/overlay/misc/hard-reboot.nix
diff --git a/overlay/misc/hard-shutdown.nix b/overlay/misc/hard-shutdown.nix
diff --git a/overlay/overlay.nix b/overlay/overlay.nix
@@ -19,8 +19,6 @@ in
     adbd = callPackage ./adbd { };
     android-headers = callPackage ./android-headers { };
     dtbTool = callPackage ./dtbtool { };
-    hard-reboot = callPackage ./misc/hard-reboot.nix { };
-    hard-shutdown = callPackage ./misc/hard-shutdown.nix { };
     libhybris = callPackage ./libhybris {
       # FIXME : verify how it acts on native aarch64 build.
       stdenv = if self.buildPlatform != self.targetPlatform then
@@ -59,6 +57,7 @@ in
     #
 
     make_ext4fs = callPackage ./make_ext4fs {};
+    hardshutdown = callPackage ./hardshutdown {};
 
     #
     # Hacks