summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd
diff options
context:
space:
mode:
authorArian van Putten <aeroboy94@gmail.com>2019-04-26 12:02:11 +0200
committerDominik Xaver Hörl <hoe.dom@gmx.de>2021-02-18 12:48:08 +0100
commit5276ebb5ee9bdd47e476d507b12141e84d2903d6 (patch)
treec1a3760ad030ba0d2b6b2c31064ba4b4709bbe89 /nixos/modules/installer/cd-dvd
parentab82f50e87e97fc29c6c706f1783067ed50fb6da (diff)
downloadnixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar.gz
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar.bz2
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar.lz
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar.xz
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.tar.zst
nixpkgs-5276ebb5ee9bdd47e476d507b12141e84d2903d6.zip
nixos: Get rid of systemConfig kernel parameter
It was introduced in c10fe14 but removed in c4f910f.

It remained such that people with older generations in their boot
entries could still boot those. Given that the parameter hasn't had any
use in quite some years, it seems safe to remove now.

Fixes #60184
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-pc.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 8159576a62a..123f487baf9 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -26,7 +26,7 @@ let
   # A clue for the kernel loading
   kernelParams = pkgs.writeText "kernel-params.txt" ''
     Kernel Parameters:
-      init=/boot/init systemConfig=/boot/init ${toString config.boot.kernelParams}
+      init=/boot/init ${toString config.boot.kernelParams}
   '';
 
   # System wide nixpkgs config
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index f2af7dcde3d..a79209d7dfe 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -23,13 +23,13 @@ let
     label nixos
       MENU LABEL ^NixOS using nfsroot
       KERNEL bzImage
-      append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
+      append ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw
 
     # I don't know how to make this boot with nfsroot (using the initrd)
     label nixos_initrd
       MENU LABEL NixOS booting the poor ^initrd.
       KERNEL bzImage
-      append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
+      append initrd=initrd ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw
 
     label memtest
       MENU LABEL ^${pkgs.memtest86.name}