24f8cf08cc
- Replace hand-rolled version of nixos-install in make-disk-image by an
actual call to nixos-install
- Required a few cleanups of nixos-install
- nixos-install invokes an activation script which the hand-rolled version
in make-disk-image did not do. We remove /etc/machine-id as that's
a host-specific, impure, output of the activation script
Testing:
nix-build '<nixpkgs/nixos/release.nix>' -A tests.installer.simple passes
Also tried generating an image with:
nix-build -E 'let
pkgs = import <nixpkgs> {};
lib = pkgs.lib;
nixos = import <nixpkgs/nixos> {
configuration = {
fileSystems."/".device = "/dev/disk/by-label/nixos";
boot.loader.grub.devices = [ "/dev/sda" ];
boot.loader.grub.extraEntries = '"''"'
menuentry "Ubuntu" {
insmod ext2
search --set=root --label ubuntu
configfile /boot/grub/grub.cfg
}
'"''"';
};
};
in import <nixpkgs/nixos/lib/make-disk-image.nix> {
inherit pkgs lib;
config = nixos.config;
diskSize = 2000;
partitioned = false;
installBootLoader = false;
}'
Then installed the image:
$ sudo df if=./result/nixos.img of=/dev/sdaX bs=1M
$ sudo resize2fs /dev/disk/by-label/nixos
$ sudo mount /dev/disk/by-label/nixos /mnt
$ sudo mount --rbind /proc /mnt/proc
$ sudo mount --rbind /dev /mnt/dev
$ sudo chroot /mnt /nix/var/nix/profiles/system/bin/switch-to-configuration boot
[ … optionally do something about passwords … ]
and successfully rebooted to that image.
Was doing all this from inside a Ubuntu VM with a single user nix install.
82 lines
1.8 KiB
Nix
82 lines
1.8 KiB
Nix
# This module generates nixos-install, nixos-rebuild,
|
|
# nixos-generate-config, etc.
|
|
|
|
{ config, pkgs, modulesPath, ... }:
|
|
|
|
let
|
|
|
|
cfg = config.installer;
|
|
|
|
makeProg = args: pkgs.substituteAll (args // {
|
|
dir = "bin";
|
|
isExecutable = true;
|
|
});
|
|
|
|
nixos-build-vms = makeProg {
|
|
name = "nixos-build-vms";
|
|
src = ./nixos-build-vms/nixos-build-vms.sh;
|
|
};
|
|
|
|
nixos-install = makeProg {
|
|
name = "nixos-install";
|
|
src = ./nixos-install.sh;
|
|
|
|
inherit (pkgs) perl pathsFromGraph rsync;
|
|
nix = config.nix.package.out;
|
|
cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
|
root_uid = config.ids.uids.root;
|
|
nixbld_gid = config.ids.gids.nixbld;
|
|
|
|
nixClosure = pkgs.runCommand "closure"
|
|
{ exportReferencesGraph = ["refs" config.nix.package.out]; }
|
|
"cp refs $out";
|
|
};
|
|
|
|
nixos-rebuild = makeProg {
|
|
name = "nixos-rebuild";
|
|
src = ./nixos-rebuild.sh;
|
|
nix = config.nix.package.out;
|
|
};
|
|
|
|
nixos-generate-config = makeProg {
|
|
name = "nixos-generate-config";
|
|
src = ./nixos-generate-config.pl;
|
|
path = [ pkgs.btrfs-progs ];
|
|
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
|
|
inherit (config.system) nixosRelease;
|
|
};
|
|
|
|
nixos-option = makeProg {
|
|
name = "nixos-option";
|
|
src = ./nixos-option.sh;
|
|
};
|
|
|
|
nixos-version = makeProg {
|
|
name = "nixos-version";
|
|
src = ./nixos-version.sh;
|
|
inherit (config.system) nixosVersion nixosCodeName nixosRevision;
|
|
};
|
|
|
|
in
|
|
|
|
{
|
|
|
|
config = {
|
|
|
|
environment.systemPackages =
|
|
[ nixos-build-vms
|
|
nixos-install
|
|
nixos-rebuild
|
|
nixos-generate-config
|
|
nixos-option
|
|
nixos-version
|
|
];
|
|
|
|
system.build = {
|
|
inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
|
|
};
|
|
|
|
};
|
|
|
|
}
|