Commit graph

167 commits

Author SHA1 Message Date
Mathijs Kwik a630b1f6f6 EFI shell got updated upstream, reflecting new hash 2012-07-05 08:31:44 +02:00
Eelco Dolstra 76c74cd7c7 initrd: Detect filesystem type before doing fsck/mount
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded.  Therefore, use blkid to
determine the filesystem type.

Also generate an /etc/fstab in the initrd rootfs on the fly.  This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
2012-06-28 10:55:44 -04:00
Lluís Batlle i Rossell 34e8f68056 system-tarball-pc: not use boot.initrd.extraTools anymore
Eelco removed the option recently, making the default initrd have the full
busybox.

I saw this evaluation error in the hydra nixos trunk page.
2012-06-27 22:26:27 +02:00
Eelco Dolstra 1da7cea223 Add Busybox to the installation CD
This is mostly to get the automated tests to succeed.
2012-06-22 14:16:55 -04:00
Eelco Dolstra 598adfee3e Fix booting from the CD-ROM
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM.  We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin.  So make sure
the "iso9660" module is loaded.
2012-06-22 11:55:23 -04:00
Eelco Dolstra 7b54922227 Don't include klibc in the installation CD 2012-06-22 11:39:27 -04:00
Lluís Batlle i Rossell 31f30722d6 Small comment fix on the system-tarball-sheevaplug.
svn path=/nixos/trunk/; revision=34418
2012-06-10 14:45:30 +00:00
Eelco Dolstra c4c68f97d1 * The volume ID is too long again. Shorten it to make it fit (just
barely) inside the 32 character limit.

  http://hydra.nixos.org/build/2660387

svn path=/nixos/trunk/; revision=34346
2012-06-04 15:02:37 +00:00
Lluís Batlle i Rossell 22fc2bdb24 Fixing the evaluation of the system-tarball-pc.
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.


svn path=/nixos/trunk/; revision=34238
2012-05-25 08:09:25 +00:00
Lluís Batlle i Rossell 4157166f8a Making the sheevaplug system tarball evaluate fine again. It had some pieces not up to date:
fileSystems definition, kernel version, ...


svn path=/nixos/trunk/; revision=34237
2012-05-25 07:52:12 +00:00
Shea Levy c716747cce Need a slighty bigger boot image to contain the efi shell
svn path=/nixos/trunk/; revision=33986
2012-05-05 14:23:51 +00:00
Shea Levy 3aae8bfa61 Switch to using efi shell + startup.nsh as the
removable media efi boot option.

svn path=/nixos/trunk/; revision=33984
2012-05-04 22:16:35 +00:00
Eelco Dolstra 6c1bb54483 * In the installation CD, make the NixOS/Nixpkgs available as if they
were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
2012-04-23 00:41:37 +00:00
Eelco Dolstra 72990dae37 * Add some missing GRUB modules.
svn path=/nixos/trunk/; revision=33886
2012-04-23 00:30:48 +00:00
Eelco Dolstra fb0a54b803 * In nixos-install, do a nix-pull from
http://nixos.org/releases/nixos/nixos-<version> to ensure we're
  getting the right binaries.

svn path=/nixos/trunk/; revision=33738
2012-04-10 22:17:37 +00:00
Eelco Dolstra 322a0ff7cd * Set the version properly in the source tree in the ISO.
svn path=/nixos/trunk/; revision=33736
2012-04-10 21:42:47 +00:00
Lluís Batlle i Rossell 2ca7e8a43e Reverting 33692, because memtest in the iso was failing.
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.

I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.


svn path=/nixos/trunk/; revision=33734
2012-04-10 21:18:48 +00:00
Eelco Dolstra 907df082dc * Including the Nixpkgs revision made the ISO volume label slightly
too long.  So make it shorter.

svn path=/nixos/trunk/; revision=33731
2012-04-10 21:08:10 +00:00
Eelco Dolstra 096b7723c8 * Add a command "nixos-version" that prints the version of the
currently activated NixOS.  This is "0.1pre-svn" when built from a
  SVN tree, but contains the actual revision when installed from the
  NixOS channel or from the ISO.

svn path=/nixos/trunk/; revision=33730
2012-04-10 20:56:38 +00:00
Eelco Dolstra 5409e76353 * Disable wicd in the installation CD for now, because it causes
dhcpcd to segfault randomly or give corrupt output.  See e.g.

    http://hydra.nixos.org/build/2380666/nixlog/1/raw

  The problem seems to be that wicd sends a "-k" command to dhcpcd to
  release the interface, which doesn't work well with a dhcpcd that
  handles all interfaces in one process.

svn path=/nixos/trunk/; revision=33720
2012-04-10 13:09:56 +00:00
Lluís Batlle i Rossell 849d136aa6 Making also the system-tarball-pc show the memtest entry as the
pkgs.memtest86.name.


svn path=/nixos/trunk/; revision=33693
2012-04-09 20:37:54 +00:00
Lluís Batlle i Rossell 9017ccf9fe Removing the special memtest.nix module for the isos, and using
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.


svn path=/nixos/trunk/; revision=33692
2012-04-09 20:36:26 +00:00
Lluís Batlle i Rossell 6e281e46b7 I update the name of the memtest entry in grub of the iso images,
because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the 
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
2012-04-09 20:30:14 +00:00
Eelco Dolstra 4f4c529979 Stage 1 improvements:
* Load scsi_wait_scan after all other kernel modules to ensure that
  all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
  seconds.
* Do a "udevadm settle" just after the root device has appeared to
  make sure that udev isn't accessing the device anymore (hopefully).
  On EC2 (Xen), I've seen fsck on the root fail randomly with "device
  in use" errors.

svn path=/nixos/trunk/; revision=33650
2012-04-06 14:20:43 +00:00
Lluís Batlle i Rossell 81655b7247 Have a more featured initrd and crashDump for the pc system tarball.
svn path=/nixos/trunk/; revision=33274
2012-03-19 19:01:52 +00:00
Shea Levy fac0fef5d8 Whoops
svn path=/nixos/trunk/; revision=33264
2012-03-19 17:25:50 +00:00
Shea Levy 53580d514a You cant modprobe efivars from within the chroot, so modprobe efivars when booting an efi-compatible install CD
svn path=/nixos/trunk/; revision=33241
2012-03-18 18:55:47 +00:00
Shea Levy b82c253b24 Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixos/trunk/; revision=33235
2012-03-18 17:14:52 +00:00
Shea Levy 097c656361 iso-image: Make efi-bootable cds actually bootable.
The image passed to genisofs needs to be a FAT image with the right filesystem
layout, not an EFI executable image

svn path=/nixos/trunk/; revision=33162
2012-03-16 16:45:40 +00:00
Shea Levy d9e28e909c Move NixosBootPkg into NixOS
svn path=/nixos/trunk/; revision=33149
2012-03-16 11:53:50 +00:00
Shea Levy c61d919941 Typographical conventions
svn path=/nixos/trunk/; revision=33148
2012-03-16 11:31:33 +00:00
Shea Levy 358b699c20 installation-cd-efi: Only build a minimal cd
svn path=/nixos/trunk/; revision=33147
2012-03-16 11:25:09 +00:00
Shea Levy a315eefca1 Restore old installation-cd-new-kernel.nix and create a new installation-cd-efi.nix
svn path=/nixos/trunk/; revision=33146
2012-03-16 11:22:05 +00:00
Shea Levy 8efda48496 Enable building an efi-bootable ISO
svn path=/nixos/trunk/; revision=33140
2012-03-16 05:37:24 +00:00
Lluís Batlle i Rossell 29ca7f2c80 Adding VIA_RHINE to the system tarball pc. I need to boot one with PXE and nfsroot with via rhine.
svn path=/nixos/trunk/; revision=32994
2012-03-11 16:39:49 +00:00
Eelco Dolstra 9d89ca0c03 * Modularise vfat support. Also add fsck.vfat to the initrd. This
prevents errors when booting from VFAT (e.g. an ISO image converted
  using unetbootin).

svn path=/nixos/trunk/; revision=32956
2012-03-09 16:17:37 +00:00
Lluís Batlle i Rossell 0b8e992d3d Setting the kernel 3.2 for the new-kernel nixos iso.
svn path=/nixos/trunk/; revision=32785
2012-03-04 21:01:20 +00:00
Eelco Dolstra 0d4eb37e16 * Fix the NixOS jobset.
svn path=/nixos/trunk/; revision=32783
2012-03-04 20:57:34 +00:00
Lluís Batlle i Rossell 97e0131291 Adding support for 3c59x NICs to the system-tarball-pc.
svn path=/nixos/trunk/; revision=32229
2012-02-11 21:13:10 +00:00
Eelco Dolstra 6b6cee46c7 * By popular demand, provide an ISO with a more recent kernel.
svn path=/nixos/trunk/; revision=30344
2011-11-08 19:51:39 +00:00
Eelco Dolstra 06843a45ef * Fix auto-login.
svn path=/nixos/trunk/; revision=30341
2011-11-08 19:02:51 +00:00
Eelco Dolstra dd28c62879 * My grep skills are lacking.
svn path=/nixos/trunk/; revision=30335
2011-11-08 16:39:13 +00:00
Eelco Dolstra b69dd8759c * minimal.nix: don't include base.nix. Also note it's not currently used.
svn path=/nixos/trunk/; revision=30333
2011-11-08 16:29:40 +00:00
Eelco Dolstra 295dafed8a * Refactoring: graphical.nix no longer includes base.nix so that it
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD.  The "auto" display manager doesn't
  properly handle shutdowns etc.

svn path=/nixos/trunk/; revision=30331
2011-11-08 16:17:37 +00:00
Eelco Dolstra ba7f635f8b * Move the hardware bits of base.nix into a separate module,
all-hardware.nix.  This allows base.nix (which should probably be
  renamed to something more descriptive) to be reused without getting
  the hardware configuration of the installation CD.

svn path=/nixos/trunk/; revision=30327
2011-11-08 15:58:59 +00:00
Eelco Dolstra 3e30d87c26 * aufs2 -> aufs.
svn path=/nixos/trunk/; revision=30323
2011-11-08 15:12:11 +00:00
Eelco Dolstra 848485a043 * Remove installation-cd-rescue as it's not used, and the other CDs
should also contain all appropriate rescue tools.

svn path=/nixos/trunk/; revision=30320
2011-11-08 14:29:35 +00:00
Eelco Dolstra b024940384 * Enable upower on the graphical ISO.
svn path=/nixos/trunk/; revision=30156
2011-10-31 21:08:22 +00:00
Peter Simons 20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy 09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00