diff --git a/README.md b/README.md index 7acb3e5..de900af 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,6 @@ count) in the system. If not enough RAM is available, the initrd cannot be loaded. Because the NixOS runs only in RAM, users can reformat all the system's discs to prepare for a new NixOS installation. -Currently, there are two variants of kexec: [nixos-kexec-installer](https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/nixos-kexec-installer-x86_64-linux.tar.xz) -and [kexec bundle](https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/kexec-bundle-x86_64-linux). - -The nixos-kexec-installer tarball is the new preferred method. - It can be booted as follows by running these commands as root: ``` @@ -44,7 +39,3 @@ The actual kexec happens with a slight delay (6s). This allows for easier integration into automated nixos installation scripts, since you can cleanly disconnect from the running machine before the kexec takes place. The tarball is also designed to be run from NixOS, which can be useful for new installations - -We also have [kexec-bundle](https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/kexec-bundle-x86_64-linux), -which is a self-extracting archive from [nixos-generators](https://github.com/nix-community/nixos-generators). -This version unpacks itself to `/` and possibly overlays the existing `/nix/store` with its own files. diff --git a/build-images.sh b/build-images.sh index 5bc47c5..028c362 100755 --- a/build-images.sh +++ b/build-images.sh @@ -19,13 +19,6 @@ build_netboot_image() { echo "$tmp/netboot-$arch.ipxe" } -build_kexec_bundle() { - declare -r tag=$1 arch=$2 tmp=$3 - # the default configuration conflicts with the kexec bundle configuration - echo "{}" > "$tmp/config.nix" - nixos-generate -o "$tmp/kexec-bundle-$arch" -c "$tmp/config.nix" -f kexec-bundle -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz" >/dev/null - echo "$tmp/kexec-bundle-$arch" -} build_kexec_installer() { declare -r tag=$1 arch=$2 tmp=$3