movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-15 05:59:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'.

Browse source 
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
This commit is contained in:
Lluís Batlle i Rossell 2010-02-18 11:35:39 +00:00
parent f1438d3d27
commit 093b51a562
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/development.xml
View file

@ -334,7 +334,7 @@ boot correctly is to use QEMU’s <option>-kernel</option> and
<screen> <screen>
$ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd $ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd
$ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel $ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/vmlinuz -initrd ./initrd/initrd -hda /dev/null $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</screen> </screen>
</para> </para>

8
modules/installer/cd-dvd/iso-image.nix
View file

@ -104,7 +104,7 @@ in
# !!! Hack - attributes expected by other modules. # !!! Hack - attributes expected by other modules.
system.build.menuBuilder = "true"; system.build.menuBuilder = "true";
system.boot.loader.kernelFile = "vmlinuz"; system.boot.loader.kernelFile = "bzImage";
environment.systemPackages = [ pkgs.grub2 ]; environment.systemPackages = [ pkgs.grub2 ];
# In stage 1 of the boot, mount the CD/DVD as the root FS by label # In stage 1 of the boot, mount the CD/DVD as the root FS by label
@ -181,8 +181,8 @@ in
{ source = pkgs.writeText "grub.cfg" grubCfg; { source = pkgs.writeText "grub.cfg" grubCfg;
target = "/boot/grub/grub.cfg"; target = "/boot/grub/grub.cfg";
} }
{ source = config.boot.kernelPackages.kernel + "/vmlinuz"; { source = config.boot.kernelPackages.kernel + "/bzImage";
target = "/boot/vmlinuz"; target = "/boot/bzImage";
} }
{ source = config.system.build.initialRamdisk + "/initrd"; { source = config.system.build.initialRamdisk + "/initrd";
target = "/boot/initrd"; target = "/boot/initrd";
@ -206,7 +206,7 @@ in
boot.loader.grub.extraEntries = boot.loader.grub.extraEntries =
'' ''
menuentry "NixOS Installer / Rescue" { menuentry "NixOS Installer / Rescue" {
linux /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams} linux /boot/bzImage init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
initrd /boot/initrd initrd /boot/initrd
} }

6
modules/installer/cd-dvd/system-tarball.nix
View file

@ -52,7 +52,7 @@ in
# !!! Hack - attributes expected by other modules. # !!! Hack - attributes expected by other modules.
system.build.menuBuilder = "true"; system.build.menuBuilder = "true";
system.boot.loader.kernelFile = "vmlinuz"; system.boot.loader.kernelFile = "bzImage";
environment.systemPackages = [ pkgs.grub2 ]; environment.systemPackages = [ pkgs.grub2 ];
# In stage 1 of the boot, mount the CD/DVD as the root FS by label # In stage 1 of the boot, mount the CD/DVD as the root FS by label
@ -83,8 +83,8 @@ in
# Individual files to be included on the CD, outside of the Nix # Individual files to be included on the CD, outside of the Nix
# store on the CD. # store on the CD.
tarball.contents = tarball.contents =
[ { source = config.boot.kernelPackages.kernel + "/vmlinuz"; [ { source = config.boot.kernelPackages.kernel + "/bzImage";
target = "/boot/vmlinuz"; target = "/boot/bzImage";
} }
{ source = config.system.build.initialRamdisk + "/initrd"; { source = config.system.build.initialRamdisk + "/initrd";
target = "/boot/initrd"; target = "/boot/initrd";

2
modules/installer/generations-dir/generations-dir.nix
View file

@ -61,6 +61,6 @@ in
boot.loader.kernelFile = ( boot.loader.kernelFile = (
if (platform.name == "sheevaplug") then "uImage" if (platform.name == "sheevaplug") then "uImage"
else if (platform.name == "versatileARM") then "zImage" else if (platform.name == "versatileARM") then "zImage"
else "vmlinuz"); else "bzImage");
}; };
} }

2
modules/installer/grub/grub.nix
View file

@ -149,7 +149,7 @@ in
# Common attribute for boot loaders so only one of them can be # Common attribute for boot loaders so only one of them can be
# set at once. # set at once.
system.boot.loader.id = "grub"; system.boot.loader.id = "grub";
system.boot.loader.kernelFile = "vmlinuz"; system.boot.loader.kernelFile = "bzImage";
environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ]; environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];