Commit Graph

129 Commits

Author SHA1 Message Date
Nicolas Pierron
3f1dd56e9e * Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
2009-04-08 14:01:16 +00:00
Eelco Dolstra
02b243e11b * Additional checks.
svn path=/nixos/trunk/; revision=14800
2009-03-31 09:27:11 +00:00
Lluís Batlle i Rossell
fd3d09b37c Adding reiserfsck to initrd to allow booting reiserfsck root filesystems
Adding mdadm to initrd to allow managing RAIDs at least on stage1 interactive shell

svn path=/nixos/trunk/; revision=14754
2009-03-29 10:59:13 +00:00
Eelco Dolstra
b470feb916 * nixpkgsPath -> nixpkgs.
svn path=/nixos/trunk/; revision=14702
2009-03-25 15:47:29 +00:00
Marc Weber
aeba0af8dd Allow specifying [] as filesystem option
because you don't need any on vservers
You still get a warning when not setting the value so that you can't
forget it.

svn path=/nixos/branches/fix-style/; revision=14477
2009-03-09 19:18:27 +00:00
Nicolas Pierron
f28c8ca553 * Remove /var/lock on startup.
* Remove /etc/mtab on startup.  This fixes the warning on
  startup when catting /proc/mount to /etc/mtab.

svn path=/nixos/branches/fix-style/; revision=14179
2009-02-22 16:08:17 +00:00
Nicolas Pierron
38e8cf175f * Use normal, dynamically linked binaries for e2fsck, lvm etc. in the
initrd instead of a mix of dietlibc, klibc and static-glibc based
  binaries.  This works by copying what we need from Glibc into the
  initrd and using patchelf to set the ELF interpreter and RPATH
  correctly.  The resulting initrd is about 500 KB smaller, but more
  importantly, it's much easier to maintain - all those
  dietlibc/klibc/static-glibc builds frequently cause build problems.

svn path=/nixos/branches/fix-style/; revision=14178
2009-02-22 16:08:13 +00:00
Nicolas Pierron
6c703347a8 * Symlink fsck.ext[234] to e2fsck. This makes the initrd 600 KB smaller.
svn path=/nixos/branches/fix-style/; revision=14177
2009-02-22 16:08:09 +00:00
Nicolas Pierron
ad36ce1f5b * Don't run fsck on journalling file systems. Instead assume
that the file system driver will replay the journal at
  mount-time in case of an unclean shutdown.  For ext3 at least
  this is *much* faster.

svn path=/nixos/branches/fix-style/; revision=14175
2009-02-22 16:08:00 +00:00
Nicolas Pierron
b0aa88e7a3 Mount `/dev/shm' (shared memory support).
svn path=/nixos/branches/fix-style/; revision=14172
2009-02-22 16:07:47 +00:00
Nicolas Pierron
6d283c6319 svn path=/nixos/branches/fix-style/; revision=14170 2009-02-22 16:07:37 +00:00
Nicolas Pierron
2e4c1b138f * Include tune2fs in the initrd. This is useful for
(say) converting from ext3 to ext4.

svn path=/nixos/branches/fix-style/; revision=14161
2009-02-22 16:06:57 +00:00
Eelco Dolstra
b25ee09ceb * Remove /var/lock on startup.
* Remove /etc/mtab on startup.  This fixes the warning on
  startup when catting /proc/mount to /etc/mtab.

svn path=/nixos/trunk/; revision=13986
2009-02-05 16:19:59 +00:00
Eelco Dolstra
ab80d81e54 * Use normal, dynamically linked binaries for e2fsck, lvm etc. in the
initrd instead of a mix of dietlibc, klibc and static-glibc based
  binaries.  This works by copying what we need from Glibc into the
  initrd and using patchelf to set the ELF interpreter and RPATH
  correctly.  The resulting initrd is about 500 KB smaller, but more
  importantly, it's much easier to maintain - all those
  dietlibc/klibc/static-glibc builds frequently cause build problems.

svn path=/nixos/trunk/; revision=13984
2009-02-05 15:57:07 +00:00
Eelco Dolstra
9774eb5798 * Symlink fsck.ext[234] to e2fsck. This makes the initrd 600 KB smaller.
svn path=/nixos/trunk/; revision=13982
2009-02-05 13:23:22 +00:00
Eelco Dolstra
aff7fba098 * Don't run fsck on journalling file systems. Instead assume
that the file system driver will replay the journal at 
  mount-time in case of an unclean shutdown.  For ext3 at least 
  this is *much* faster.

svn path=/nixos/trunk/; revision=13932
2009-02-01 19:53:59 +00:00
Ludovic Courtès
6085b298ae Mount `/dev/shm' (shared memory support).
svn path=/nixos/trunk/; revision=13908
2009-01-29 19:17:55 +00:00
Eelco Dolstra
42a83d3391 svn path=/nixos/trunk/; revision=13906 2009-01-29 17:50:28 +00:00
Eelco Dolstra
1603d28819 * Include tune2fs in the initrd. This is useful for
(say) converting from ext3 to ext4.

svn path=/nixos/trunk/; revision=13772
2009-01-15 13:49:00 +00:00
Nicolas Pierron
7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron
b67e2a12aa Convert "boot/boot-stage-2.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13684
2009-01-02 16:07:30 +00:00
Ludovic Courtès
477ea7015c boot-stage-1: Don't run `fsck' when on battery power.
svn path=/nixos/trunk/; revision=13484
2008-11-28 12:03:56 +00:00
Nicolas Pierron
205a7431ac Remove extra arguments comming from config.*.
svn path=/nixos/branches/fix-style/; revision=13381
2008-11-23 01:29:20 +00:00
Nicolas Pierron
3b2016569a Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}.
svn path=/nixos/branches/fix-style/; revision=13380
2008-11-23 01:29:13 +00:00
Eelco Dolstra
4bd1537860 * Create /nix/var/nix/chroots in the activation script
and re-create it at boot time.

svn path=/nixos/trunk/; revision=13152
2008-10-29 15:43:37 +00:00
Eelco Dolstra
ea67a42d26 * Continue booting when loading a kernel module fails. For instance,
on my system when booting Linux 2.6.27, ide-generic fails with
  "Cannot allocate memory" (maybe because ata_piix already claimed the
  IDE devices?).

svn path=/nixos/trunk/; revision=13147
2008-10-29 13:38:43 +00:00
Eelco Dolstra
d146d9945b * Disable deleting /tmp at boot time. This should be controlled
by an option (which should default to off, IMHO).  I was rather
  surprised when I rebooted my system and it started deleting all
  of /tmp (which, for instance, contained some test DB/repos for 
  the Subversion server)...

svn path=/nixos/trunk/; revision=13145
2008-10-29 13:10:49 +00:00
Ludovic Courtès
4891014cca boot-stage-2-init.sh: Delete files under `/tmp'.
svn path=/nixos/trunk/; revision=13034
2008-10-09 20:05:52 +00:00
Eelco Dolstra
ff6a662f6e * Fixed some typos, cleaned up the indentation.
svn path=/nixos/trunk/; revision=12720
2008-08-26 12:45:36 +00:00
Marc Weber
b69efea5a7 reworked error handling on startup (stage-1)
on any error you'll be asked to run (interactive/ final) shell or continue ignoring the error

svn path=/nixos/trunk/; revision=12639
2008-08-16 00:59:12 +00:00
Eelco Dolstra
d74caf133a * Idem.
svn path=/nixos/trunk/; revision=12634
2008-08-15 14:15:25 +00:00
Marc Weber
2eb6597bd3 remove maybe existing /etc/mtab symlink and only mount usb if kernel supports it
svn path=/nixos/trunk/; revision=12570
2008-08-10 12:23:28 +00:00
Eelco Dolstra
2783f96ce7 * Remove the sleep-5-seconds hack in the initrd, instead loop until
the device to mount appears.  This wasn't previously possible
  because of root devices specified by label (mounted via "mount
  LABEL=foo ..."), but now we use /dev/disk/by-label so we can easily
  test whether the device already exists.

svn path=/nixos/trunk/; revision=12562
2008-08-08 23:15:36 +00:00
Eelco Dolstra
a83becdee8 * When booting from the installation CD, just mount
/dev/disk/by-label/<label>.  This makes the whole
  autoDetectRootDevice/rootLabel machinery unnecessary.

svn path=/nixos/trunk/; revision=12561
2008-08-08 23:01:30 +00:00
Eelco Dolstra
b760a4b8d9 * Use the persistent storage udev rules in the initrd so that we can
use /dev/disk/by-{label,id,...} names for the root FS.
* Kill udevd at the end of stage 1.  Don't know how it got killed
  previously...

svn path=/nixos/trunk/; revision=12560
2008-08-08 22:44:45 +00:00
Eelco Dolstra
a33d2f3adc * Use a klibc-based udev. Hopefully this fixes the problems
encountered on x86-64 when udev is compiled against dietlibc.

svn path=/nixos/trunk/; revision=12555
2008-08-08 19:07:07 +00:00
Eelco Dolstra
63e316ecac * Refactoring: move all the initrd-generation related stuff to
boot-stage-1.nix in order to unclutter system.nix.

svn path=/nixos/trunk/; revision=12547
2008-08-08 17:34:30 +00:00
Eelco Dolstra
abbe260a80 * Don't use modprobe but insmod in the initrd. This means we don't
need module-init-tools in the initrd, since insmod is in klibc.
* Give the installation CD a label.

svn path=/nixos/trunk/; revision=12545
2008-08-08 17:07:04 +00:00
Eelco Dolstra
4d6548e94c * Use the tools from klibc in the initrd instead of the static-tools.
This makes the initrd a few megabytes smaller.
* Use run-init from klibc to delete everything in the initrd ramfs
  prior to switching to the real root FS.
* Removed the stage2Init argument.

svn path=/nixos/trunk/; revision=12544
2008-08-08 15:49:57 +00:00
Eelco Dolstra
eaf6b8eb18 * udevtrigger / udevsettle -> udevadm.
svn path=/nixos/trunk/; revision=12229
2008-07-01 08:28:56 +00:00
Michael Raskin
dc27e80fad Changes to support swsusp and custom kernels.
svn path=/nixos/trunk/; revision=11272
2008-03-24 19:37:32 +00:00
Eelco Dolstra
249fc3c135 * Fix weird "systemConfig=blabla" errors due to wrong parsing
of the resume= kernel parameter.

svn path=/nixos/trunk/; revision=11260
2008-03-22 16:03:43 +00:00
Eelco Dolstra
5d7f0e7967 * Suppress some errors if tuxonice isn't loaded.
svn path=/nixos/trunk/; revision=11259
2008-03-22 16:02:57 +00:00
Eelco Dolstra
52aed402db * Moved to Nixpkgs.
svn path=/nixos/trunk/; revision=11155
2008-03-17 10:51:09 +00:00
Michael Raskin
4b8b296c30 Some changes (at least wipe resume image securely even without TuxOnIce)
svn path=/nixos/trunk/; revision=10881
2008-02-28 09:59:01 +00:00
Eelco Dolstra
ce250ffb37 * Installation CD: include a lot of modules (SATA, PATA, Firewire,
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
2008-02-08 15:59:15 +00:00
Eelco Dolstra
57a01e7733 * Prevent warnings about existing directories.
svn path=/nixos/trunk/; revision=10489
2008-02-04 10:20:38 +00:00
Eelco Dolstra
2da50038e4 * Use aufs instead of unionfs, it seems to be more stable.
svn path=/nixos/trunk/; revision=10390
2008-01-29 18:53:15 +00:00
Eelco Dolstra
49e8829053 * Use unionfs to provide a real Live CD, i.e., the files on the CD
appear writable (though all writes go to a tmpfs).  This allows you
  to run Nix operations on the Live CD.  However, we're not quite
  there yet since the CD doesn't have a valid Nix database.  So for
  instance a garbage collect will cause everything to be deleted,
  hanging the system.

svn path=/nixos/trunk/; revision=10276
2008-01-24 16:56:09 +00:00
Eelco Dolstra
86484779c7 * Mount usbfs on /proc/bus/usb.
svn path=/nixos/trunk/; revision=10220
2008-01-18 15:18:32 +00:00