diff options
| -rw-r--r-- | config/common.nix | 5 | ||||
| -rw-r--r-- | config/container.nix | 5 | ||||
| -rw-r--r-- | machines/generic-container.nix | 2 | ||||
| -rw-r--r-- | release.nix | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/config/common.nix b/config/common.nix index 238ec41..20bd4dd 100644 --- a/config/common.nix +++ b/config/common.nix @@ -47,9 +47,4 @@ }; boot.cleanTmpDir = true; - boot.specialFileSystems = lib.optionalAttrs (config.boot.isContainer) { - "/dev/pts" = { - options = lib.mkAfter [ "ptmxmode=666" ]; - }; - }; } diff --git a/config/container.nix b/config/container.nix index 4cf3c17..20bf1d9 100644 --- a/config/container.nix +++ b/config/container.nix @@ -11,4 +11,9 @@ mkdir -p /sbin/init ln -fs $systemConfig/init /sbin/init ''; + boot.specialFileSystems = { + "/dev/pts" = { + options = lib.mkAfter [ "ptmxmode=666" ]; + }; + }; } diff --git a/machines/generic-container.nix b/machines/generic-container.nix index 6c6c332..d25be53 100644 --- a/machines/generic-container.nix +++ b/machines/generic-container.nix @@ -5,6 +5,8 @@ ../config/users.nix ]; + users.extraUsers.root.initialHashedPassword = mkOverride 150 "love"; + networking = { hostName = lib.mkForce "new-container"; }; diff --git a/release.nix b/release.nix index f27f2c7..e9fc353 100644 --- a/release.nix +++ b/release.nix @@ -6,7 +6,7 @@ let pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; makeSystemTarball = - { module, maintainers ? ["orbekk"], system }: + { module, system }: let versionModule = { @@ -34,7 +34,7 @@ let # Some container managers like lxc need these extraCommands = pkgs.writeScript "setup.sh" '' mkdir -p proc sys dev sbin - ln -s init sbin/init + ln -s ${config.system.build.toplevel}/init sbin/init ''; }; in |