From 83a7262b9c723767bf23efa194e8add3ee018406 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 15:40:17 +0200
Subject: [PATCH 1/2] ma source: add patch for proot
---
makefu/source.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/makefu/source.nix b/makefu/source.nix
index 1a5d4a5d7..a29d09008 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -11,13 +11,14 @@ let
then "buildbot"
else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
- ref = "46cfb36"; # unstable @ 2017-09-04
+ ref = "59e7765"; # unstable @ 2017-09-04
# + graceful requests2 (a772c3a)
# + mitmproxy fix (eee2d17)
# + tpm-tools fix (5cb9987)
# + dnscrypt-wrapper (25703c3)
# + lass wvstream fix (76f4910,37cc2bc,0d48837)
# + ruby stuff (2f0b17e4be9,55a952be5b5)
+ # + proot aarch64 fix (05d2603173d)
in
evalSource (toString _file) [
From fbaf146bcacc0632a01dd81830d172a58a649434 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 1 Oct 2017 20:12:06 +0200
Subject: [PATCH 2/2] ma cake.r: update config
---
makefu/1systems/cake/config.nix | 45 +++++++++++++++++++++------------
1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index 0630d19ad..826af24e7 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -1,20 +1,33 @@
{ config, pkgs, ... }:
{
- imports = [
- <stockholm/makefu>
- # configure your hw:
- # <stockholm/makefu/2configs/hw/CAC.nix>
- # <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
- # <stockholm/makefu/2configs/save-diskspace.nix
- ];
- krebs = {
- enable = true;
- tinc.retiolum.enable = true;
- build.host = config.krebs.hosts.cake;
+ imports = [
+ <stockholm/makefu>
+# configure your hw:
+# <stockholm/makefu/2configs/save-diskspace.nix>
+ ];
+ krebs = {
+ enable = true;
+ tinc.retiolum.enable = true;
+ build.host = config.krebs.hosts.cake;
+ };
+ boot.loader.grub.enable = false;
+ boot.loader.generic-extlinux-compatible.enable = true;
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+ boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0" ];
+
+ programs.info.enable = false;
+ programs.man.enable = false;
+ services.nixosManual.enable = false;
+
+# File systems configuration for using the installer's partition layout
+ fileSystems = {
+ "/boot" = {
+ device = "/dev/disk/by-label/NIXOS_BOOT";
+ fsType = "vfat";
};
- # You want to change these :)
- boot.loader.grub.device = "/dev/sda";
- fileSystems."/" = {
- device = "/dev/sda1";
+ "/" = {
+ device = "/dev/disk/by-label/NIXOS_SD";
+ fsType = "ext4";
};
-}
\ No newline at end of file
+ };
+}