JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,132 Commits 2 Branches 0 Tags 13 GiB
b92036e803
Commit Graph

109 Commits

Author SHA1 Message Date
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
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
Michael Raskin
4475a74fb8 LiveDVD with X and sources made. 
svn path=/nixos/trunk/; revision=10119
 2008-01-11 16:59:39 +00:00
Eelco Dolstra
d4168a89b1 * Get rid of some spurious error messages. 
svn path=/nixos/trunk/; revision=9968
 2007-12-25 16:07:55 +00:00
Michael Raskin
ba09f592c8 Added TuxOnIce support to initscripts 
svn path=/nixos/trunk/; revision=9960
 2007-12-20 21:33:45 +00:00
Eelco Dolstra
79c7f2cecc * Make fsck shut up about missing fstab. Contributed 
by Nicolas Pierron.

svn path=/nixos/trunk/; revision=9571
 2007-11-01 15:58:01 +00:00
Eelco Dolstra
c43dc7b013 * Allow Upstart's init to be upgraded in a running system. 
svn path=/nixos/trunk/; revision=9375
 2007-09-27 12:24:05 +00:00
Yury G. Kudryashov
867d814d27 Remove unneeded copy of lvm in initrd. 
Something replaces symlinks in initrd with copies. Removed symlinks to lvm and
changed syntax (vgscan -> lvm vgscan).

svn path=/nixos/trunk/; revision=9233
 2007-09-01 18:05:46 +00:00
Yury G. Kudryashov
3944916856 Support for mounting pseudo-felisystems during stage1 
Don't ignore fsType field, don't add /mnt/root to device names not starting with
'/'.

svn path=/nixos/trunk/; revision=9232
 2007-09-01 17:59:00 +00:00
Yury G. Kudryashov
cd1023c50d * Added boot.initrd.lvm flag for use NixOS with LVM2 root partition. 
* Added sis support for xserver.

svn path=/nixos/trunk/; revision=8924
 2007-06-28 09:57:36 +00:00
Eelco Dolstra
15e3ec8dec * Additional debug options for stage 1 (can be passed on the kernel 
command line):
  - debug1devices: drop into a shell after modules have been load and
    device nodes have been created.
  - debug1mounts: drop into a shell after file systems have been
    mounted.

svn path=/nixos/trunk/; revision=8804
 2007-05-30 10:32:42 +00:00
Eelco Dolstra
6b627a9ca7 * Back out some Wouter-specific profile settings ;-) 
svn path=/nixos/trunk/; revision=8801
 2007-05-29 19:54:14 +00:00
Wouter den Breejen
2e50d9cd58 nixos dir: Xserver and samba nixos 
svn path=/nixos/trunk/; revision=8784
 2007-05-28 14:09:04 +00:00
Eelco Dolstra
aab8fda25a * Option `networking.localCommands' to specify shell commands to be 
executed after the network interfaces have been initialised.

svn path=/nixos/trunk/; revision=8752
 2007-05-24 14:50:17 +00:00
Eelco Dolstra
7243eb1d1d * Create /bin on the CD to suppress the /bin/sh symlink creation 
error.
* Put the top-level system config on the CD, otherwise root doesn't
  get a working login shell on the CD (and the system PATH is broken
  as well).

svn path=/nixos/trunk/; revision=8658
 2007-05-09 17:32:41 +00:00
Eelco Dolstra
c10fe148a3 * /var/run/current-system symlinks to the top-level path of the system 
configuration now.
* /var/run/booted-system symlinks to the system configuration used at
  boot time.

svn path=/nixos/trunk/; revision=8381
 2007-03-20 13:01:53 +00:00
Eelco Dolstra
8851530afb * Setting boot.localCommands for anything you want to execute before 
Upstart is started.

svn path=/nixos/trunk/; revision=8229
 2007-03-06 00:45:33 +00:00
Eelco Dolstra
f2e85499f3 * Doh. 
svn path=/nixos/trunk/; revision=7864
 2007-02-06 18:29:20 +00:00
Eelco Dolstra
8cf1eceb0a * Allow multiple file systems to be mounted in stage 1 (i.e., from the 
initrd).  This is useful if /nix (which is necessary for stage 2) is
  on a different file system than /.

svn path=/nixos/trunk/; revision=7862
 2007-02-06 16:53:36 +00:00
Eelco Dolstra
d197a0f2cc * Use the Perl version of paths-from-graphs everywhere. 
svn path=/nixos/trunk/; revision=7774
 2007-01-23 14:37:42 +00:00
Eelco Dolstra
cf9016d816 * Mount devpts. 
* Set the right permissions on /dev/tty and /dev/ptmx.

svn path=/nixos/trunk/; revision=7703
 2007-01-16 22:34:15 +00:00
Eelco Dolstra
cb10364838 * Use a diet udev in boot stage 1 to create the device nodes in /dev. 
svn path=/nixos/trunk/; revision=7608
 2007-01-10 12:42:28 +00:00