Commit graph

1180 commits

Author SHA1 Message Date
Eelco Dolstra
ffe45949e8 * Use the right mount command in the filesystems job so that
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
2008-08-09 12:03:08 +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
1c2d81d93d * Remove "obsolete" notation.
svn path=/nixos/trunk/; revision=12557
2008-08-08 19:40:19 +00:00
Eelco Dolstra
a662f1c473 * Fix building the manual.
svn path=/nixos/trunk/; revision=12556
2008-08-08 19:25:31 +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
Nicolas Pierron
2e9dc1ea47 Rename option: services.xserver.packageFun -> .package
svn path=/nixos/trunk/; revision=12553
2008-08-08 18:57:11 +00:00
Nicolas Pierron
3fd58f8a03 Declare obsolete: hardware option; options with arguments.
svn path=/nixos/trunk/; revision=12552
2008-08-08 18:57:09 +00:00
Nicolas Pierron
51210b1904 Remove pkgs argument of:
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
2008-08-08 18:57:07 +00:00
Nicolas Pierron
9fc41fc64f Prepare the removal of pkgs arguments.
If user options are using pkgs arguments, these would be replaced by the pkgs argument given to the whole option component expression instead of the pkgs argument given to the option.

svn path=/nixos/trunk/; revision=12550
2008-08-08 18:57:04 +00:00
Nicolas Pierron
d63bfe3c31 Use the new configuration scheme for system's options.
svn path=/nixos/trunk/; revision=12549
2008-08-08 18:56:58 +00:00
Michael Raskin
b8ff944cd2 Postfix list separator fix
svn path=/nixos/trunk/; revision=12548
2008-08-08 18:51:32 +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
Michael Raskin
e7438b3525 Ported disk labelling.
svn path=/nixos/trunk/; revision=12546
2008-08-08 17:13:46 +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
Michael Raskin
2bcb5a8efe Removed tabs in nix-expressions introduced by me in nixos/ tree.
svn path=/nixos/trunk/; revision=12532
2008-08-07 10:23:20 +00:00
Michael Raskin
014b33637c Added an option to easily allow everyone to use "at".
svn path=/nixos/trunk/; revision=12531
2008-08-07 10:09:17 +00:00
Nicolas Pierron
791d8bbc66 Add udev extra option (addUdevPkgs).
Add some merge functions.

svn path=/nixos/trunk/; revision=12523
2008-08-06 19:26:47 +00:00
Nicolas Pierron
53bdeb43e3 Rewrite the optionDeclarations to collect all options definitions.
svn path=/nixos/trunk/; revision=12521
2008-08-06 18:43:53 +00:00
Nicolas Pierron
92560a1dc0 Use the new scheme of configuration evaluation.
svn path=/nixos/trunk/; revision=12519
2008-08-06 17:39:05 +00:00
Eelco Dolstra
f5e61dfa0c * Provide a mount command that knows how to mount ntfs-3g and cifs
file systems.  The main advantage is that this allows mounting of
  such file systems from the `filesystems' configuration option at
  boot time, e.g.

    fileSystems = [
      ...
      { mountPoint = "/windows";
        device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
        fsType = "ntfs-3g";
      }
    ];

  The list of file system helpers should of course be made
  configurable.

svn path=/nixos/trunk/; revision=12516
2008-08-06 15:48:12 +00:00
Sander van der Burg
f652a0836a Added support for custom context.xml
svn path=/nixos/trunk/; revision=12513
2008-08-06 15:07:29 +00:00
Sander van der Burg
afdfff7ed8 Added common lib support for tomcat
svn path=/nixos/trunk/; revision=12511
2008-08-06 13:41:08 +00:00
Eelco Dolstra
64fc690afa * Make that dry-run' (as an action) instead of --dry-run'.
svn path=/nixos/trunk/; revision=12488
2008-08-04 15:04:06 +00:00
Eelco Dolstra
3ea5264b1b * Option `--dry-run' to see what's going to be built.
* Properly parse the command line arguments before doing anything
  (reported by Andres).

svn path=/nixos/trunk/; revision=12486
2008-08-04 14:58:26 +00:00
Michael Raskin
cb8067cdb5 More configuratbility for vsFTPd upstart job.
svn path=/nixos/trunk/; revision=12472
2008-08-04 09:36:11 +00:00
Michael Raskin
3721828bc6 Using ISO 9660:1999 for live optical disks..
svn path=/nixos/trunk/; revision=12460
2008-08-01 09:17:23 +00:00
Eelco Dolstra
e40d6858d9 * udev: create symlinks /dev/{cd,dvd,cdrw,dvdrw}.
svn path=/nixos/trunk/; revision=12456
2008-07-31 14:13:35 +00:00
Eelco Dolstra
274c67a363 * Don't create a setuid wrapper for programs that don't exist.
svn path=/nixos/trunk/; revision=12429
2008-07-25 13:34:00 +00:00
Eelco Dolstra
02be895820 * Inline the builder.
svn path=/nixos/trunk/; revision=12428
2008-07-25 13:33:42 +00:00
Eelco Dolstra
339839a134 * Some more programs to make setuid by default.
svn path=/nixos/trunk/; revision=12427
2008-07-25 13:33:10 +00:00
Eelco Dolstra
3e8be34fcc * Set $NIX_OTHER_STORES to /var/run/nix/remote-stores to make
automatic copying of build results from remote Nix stores work
  more-or-less automatically.  All you have to do is mount the remote
  FS on a subdirectory of /var/run/nix/remote-stores, e.g.

    $ sshfs remote_machine:/ /var/run/nix/remote-stores/foo

* Set $NIXPKGS_ALL.

svn path=/nixos/trunk/; revision=12411
2008-07-23 16:06:03 +00:00
Eelco Dolstra
5ec1fa2060 * Tabs considered harmful.
svn path=/nixos/trunk/; revision=12407
2008-07-23 14:13:27 +00:00
Eelco Dolstra
cc902c638c svn path=/nixos/trunk/; revision=12406 2008-07-23 13:47:32 +00:00
Eelco Dolstra
a66248e2a2 * Fix extraGrubEntriesBeforeNixos, it always placed the extra entries
before the default (so I suddenly found myself booting into 
  Windows...).  BTW it would be better to have string-valued options
  like extraGrubEntriesBefore / extraGrubEntriesAfter or something 
  like that.

svn path=/nixos/trunk/; revision=12401
2008-07-23 09:10:19 +00:00
Eelco Dolstra
088b09f401 * Move most bash initialisation to /etc/bashrc. Now finally ssh
commands like "ssh -t host command" initialise the environment
  properly.

svn path=/nixos/trunk/; revision=12366
2008-07-16 16:01:09 +00:00
Michael Raskin
0ac32cbb99 Added comments about seccureKeys for configuration files encryption
svn path=/nixos/trunk/; revision=12342
2008-07-11 08:01:09 +00:00
Ludovic Courtès
48ec05d257 Fix typo in /etc/profile' that led to a wrong LD_LIBRARY_PATH'.
svn path=/nixos/trunk/; revision=12332
2008-07-10 13:45:12 +00:00
Ludovic Courtès
8eb0444ab8 lshd: Explicitly pass all options to the daemon.
svn path=/nixos/trunk/; revision=12319
2008-07-08 07:24:28 +00:00
Sander van der Burg
6a2600c0a2 Added some more features to the tomcat service
svn path=/nixos/trunk/; revision=12284
2008-07-06 19:55:34 +00:00
Sander van der Burg
82ddadc27c Added disnix service
svn path=/nixos/trunk/; revision=12283
2008-07-06 18:34:19 +00:00
Sander van der Burg
6df19e0cbb Added disnix
svn path=/nixos/trunk/; revision=12282
2008-07-06 18:34:03 +00:00
Sander van der Burg
045ae06092 Updated ejabberd service to make it work
svn path=/nixos/trunk/; revision=12270
2008-07-06 10:30:53 +00:00
Sander van der Burg
7813be5e54 Updated tomcat service with a more sophisticated model
svn path=/nixos/trunk/; revision=12268
2008-07-05 22:27:36 +00:00
Wouter den Breejen
ab41596a7f Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries
svn path=/nixos/trunk/; revision=12263
2008-07-05 00:16:39 +00:00
Michael Raskin
2c56d137ee I hope that hardwareScan = false now works as expected again...
svn path=/nixos/trunk/; revision=12253
2008-07-03 18:54:16 +00:00
Eelco Dolstra
9b55a5c178 * Generation of /etc/fonts/fonts.conf: moved to Nixpkgs.
svn path=/nixos/trunk/; revision=12252
2008-07-03 14:35:02 +00:00
Eelco Dolstra
6ed65c2d95 * Removing hardware-scan.nix also removed the loading of the
kernel modules listed in config.boot.kernelModules.  So do
  that in the udev job for lack of a better place.

svn path=/nixos/trunk/; revision=12249
2008-07-03 10:45:14 +00:00