Commit Graph

1725 Commits

Author SHA1 Message Date
Eelco Dolstra
f4b5a21d59 * Fix building the manual.
svn path=/nixos/branches/modular-nixos/; revision=15877
2009-06-05 15:04:58 +00:00
Eelco Dolstra
d69710cdf4 * Removed redundant import (Nicolas Pierron).
svn path=/nixos/branches/modular-nixos/; revision=15876
2009-06-05 15:04:33 +00:00
Eelco Dolstra
f9cfe7c4ee * The activation script can't use /bin/sh as its interpreter because
it creates the /bin/sh symlink, which may not exist yet (esp. when
  booting from CD).

svn path=/nixos/branches/modular-nixos/; revision=15875
2009-06-05 15:03:56 +00:00
Eelco Dolstra
e4e408293e * Modularise the building of the installation CD/DVD. The module
iso-image.nix contains the minimal stuff necessary to build a
  bootable ISO image containing the given configuration.  The idea is
  that this can be customised by providing additional modules, e.g. to
  add extra packages to the image.

  The ISO image is exported in the configuration attribute
  system.build.isoImage.  So it can be built as follows:

  $ nix-build lib/eval-config.nix \
      --arg configuration 'import ./modules/installer/cd-dvd/iso-image.nix' \
      -A config.system.build.isoImage


svn path=/nixos/branches/modular-nixos/; revision=15871
2009-06-05 13:35:27 +00:00
Eelco Dolstra
a4fa62aaf0 * The fileSystems option shouldn't have a default.
svn path=/nixos/branches/modular-nixos/; revision=15867
2009-06-05 13:30:30 +00:00
Eelco Dolstra
d6617f0d5e svn path=/nixos/branches/modular-nixos/; revision=15866 2009-06-05 13:24:23 +00:00
Eelco Dolstra
02d26fc77d * Make eval-config.nix a bit more general to make it easier to build
other kinds of configurations (like the installation CD).

svn path=/nixos/branches/modular-nixos/; revision=15864
2009-06-05 13:19:39 +00:00
Eelco Dolstra
dc8cbffe31 * Revert r15862, as the "host" package in system-path.nix (or any other
package) can be overriden by setting environment.systemPackages in
  /etc/nixos/configuration.nix: it shouldn't be special-cased.

svn path=/nixos/branches/modular-nixos/; revision=15863
2009-06-05 12:57:44 +00:00
Michael Raskin
7e2574c4fd Let host be overriden with a better ISC Bind version if the latter is installed
svn path=/nixos/branches/modular-nixos/; revision=15862
2009-06-05 12:44:32 +00:00
Eelco Dolstra
5bcfbcac88 * We lost the "host" command somewhere.
svn path=/nixos/branches/modular-nixos/; revision=15861
2009-06-05 12:39:37 +00:00
Eelco Dolstra
aa3ce13270 * Merged some trunk commits.
svn path=/nixos/branches/modular-nixos/; revision=15860
2009-06-05 11:18:58 +00:00
Eelco Dolstra
021c65da98 * Quick hack in the X server job: wait until udev is running, since we
need some devices.  In particular this fixes the "Cannot open
  virtual console 7" errors in VirtualBox.  (There's nothing special
  about VirtualBox, but the different timing makes it more likely to
  trigger this bug.)

svn path=/nixos/branches/modular-nixos/; revision=15836
2009-06-03 08:14:54 +00:00
Eelco Dolstra
b425888b62 * Updated URL.
svn path=/nixos/trunk/; revision=15831
2009-06-02 21:16:06 +00:00
Eelco Dolstra
116306c8dc * Restart ntpd when we get a new DHCP lease. Without this, if ntpd
previously failed to resolve the NTP server hostnames in its config
  file, it will happily sit in a loop forever doing nothing.

svn path=/nixos/branches/modular-nixos/; revision=15830
2009-06-02 19:42:31 +00:00
Eelco Dolstra
674d63e212 * Don't do a separate "ntp -q -g" to reset the system time in the ntp
start script.  It's probably not necessary, but more importantly, it
  can hang forever if the network is down.  (Actually it will sit in a
  loop waiting for UDP packets that will never arrive.)  This causes
  the NixOS reboot to hang, since Upstart can't kill jobs stuck in
  their start script.

svn path=/nixos/branches/modular-nixos/; revision=15829
2009-06-02 19:40:14 +00:00
Eelco Dolstra
40497a10e6 * The manual/rogue jobs already declare an extry TTY.
svn path=/nixos/trunk/; revision=15824
2009-06-02 14:53:24 +00:00
Eelco Dolstra
a0e7572da7 * Only set kdePackages if the X server is enabled. Otherwise we get
KDE 3 in the ISO image.

svn path=/nixos/trunk/; revision=15823
2009-06-02 14:36:57 +00:00
Eelco Dolstra
5ed2a75f50 * Don't include the services tree. It shouldn't be needed except for
some legacy stuff.  (And it broke the ISO build for the last month
  or so.)

svn path=/nixos/trunk/; revision=15822
2009-06-02 14:31:21 +00:00
Ludovic Courtès
365df3e29a Add `gpsd' Upstart job.
svn path=/nixos/trunk/; revision=15811
2009-05-31 18:51:29 +00:00
Eelco Dolstra
720d51179e * kdm needs the "kde" PAM module, but you only get it when KDE is
enabled as a session type.  Since I'm lazy, provide it
  unconditionally.  Also have it include "common-console" to set
  device ownership when logging in.

svn path=/nixos/branches/modular-nixos/; revision=15800
2009-05-29 14:57:31 +00:00
Eelco Dolstra
35c465f3da svn path=/nixos/branches/modular-nixos/; revision=15799 2009-05-29 14:51:03 +00:00
Eelco Dolstra
29a956fe37 * Merge r15704 from trunk.
svn path=/nixos/branches/modular-nixos/; revision=15798
2009-05-29 14:49:47 +00:00
Eelco Dolstra
234c4340c2 * helpers -> lib.
svn path=/nixos/branches/modular-nixos/; revision=15797
2009-05-29 14:46:27 +00:00
Eelco Dolstra
dba1d48b78 * Move the uid/gid mappings into a module. This allows other modules
to use it through config.ids.{uids,gids} rather than `import
  relative-path/ids.nix'.

svn path=/nixos/branches/modular-nixos/; revision=15796
2009-05-29 14:25:56 +00:00
Eelco Dolstra
c4f50d85cb * Moved the last modules to modules/.
svn path=/nixos/branches/modular-nixos/; revision=15795
2009-05-29 14:11:02 +00:00
Eelco Dolstra
82254ce466 * Doh.
svn path=/nixos/branches/modular-nixos/; revision=15794
2009-05-29 13:30:28 +00:00
Eelco Dolstra
ca0038b9b0 svn path=/nixos/branches/modular-nixos/; revision=15793 2009-05-29 13:30:12 +00:00
Eelco Dolstra
81d8c2e1c8 * Move the info wrapper into a module.
svn path=/nixos/branches/modular-nixos/; revision=15792
2009-05-29 13:29:49 +00:00
Eelco Dolstra
548fb6a1a5 * Move the optional parts of the system path to the appropriate
modules.

svn path=/nixos/branches/modular-nixos/; revision=15791
2009-05-29 13:15:31 +00:00
Eelco Dolstra
0da38f14f5 * Forgot to commit.
svn path=/nixos/branches/modular-nixos/; revision=15789
2009-05-29 12:43:29 +00:00
Eelco Dolstra
f36643b6c2 * Move the installer tools to modules/installer/tools.
svn path=/nixos/branches/modular-nixos/; revision=15788
2009-05-29 12:41:29 +00:00
Eelco Dolstra
df96e5c456 * Move nixos-checkout into its own module.
svn path=/nixos/branches/modular-nixos/; revision=15787
2009-05-29 12:24:48 +00:00
Eelco Dolstra
19e0f46b0e * One down, three to go.
svn path=/nixos/branches/modular-nixos/; revision=15784
2009-05-29 10:04:04 +00:00
Lluís Batlle i Rossell
48e7f85acb Allowing the system bashrc not to be parsed, if an env variable exists.
I think bash used not to include the system bashrc on "--rcfile myrc", but
as now it doesn't allow it anymore, let's go on the env variable.


svn path=/nixos/trunk/; revision=15779
2009-05-28 22:02:47 +00:00
Eelco Dolstra
107fc990a6 * More cleanup.
svn path=/nixos/branches/modular-nixos/; revision=15773
2009-05-28 16:20:08 +00:00
Eelco Dolstra
c6c9304b95 * system/options.nix: gone :-)
svn path=/nixos/branches/modular-nixos/; revision=15772
2009-05-28 16:03:48 +00:00
Eelco Dolstra
fc9111fadf * Move various system initialisation tasks (e.g. mounting filesystems,
initialising network interfaces, etc.) to modules/tasks.  This
  follows the Upstart terminology: a service is a job that doesn't
  usually terminate (e.g. a daemon), while a task is a job that does
  some work and then exits.

svn path=/nixos/branches/modular-nixos/; revision=15771
2009-05-28 15:03:05 +00:00
Eelco Dolstra
e86b066625 * That wasn't quite right.
svn path=/nixos/branches/modular-nixos/; revision=15770
2009-05-28 14:57:31 +00:00
Eelco Dolstra
fdbe09e914 * Moved the guest-users.nix module to modules/config. Clearing the
passwords is now done in an activation scriptlet rather than an
  Upstart job (not tested).  BTW, we should get rid of this module and
  add support to the users-groups.nix module for creating accounts
  with an empty password.

svn path=/nixos/branches/modular-nixos/; revision=15769
2009-05-28 14:37:30 +00:00
Eelco Dolstra
29611e49fd * More cleanup.
svn path=/nixos/branches/modular-nixos/; revision=15768
2009-05-28 13:36:38 +00:00
Eelco Dolstra
3c84d56273 * Move the /etc generation to modules/system/etc.
svn path=/nixos/branches/modular-nixos/; revision=15767
2009-05-28 13:17:56 +00:00
Eelco Dolstra
14f1c81822 * Move PAM configuration to modules/security/pam.nix.
svn path=/nixos/branches/modular-nixos/; revision=15766
2009-05-28 13:10:02 +00:00
Eelco Dolstra
de7aae5d5e * Move the generation of /etc/nix.machines to the nix-daemon module.
svn path=/nixos/branches/modular-nixos/; revision=15765
2009-05-28 12:56:56 +00:00
Eelco Dolstra
e4716ce3ef * Move global networking data (/etc/services, /etc/protocols,
/etc/rpc, /etc/hosts) to modules/config/networking.nix.

svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
Eelco Dolstra
d1fd51136f svn path=/nixos/branches/modular-nixos/; revision=15762 2009-05-28 12:25:50 +00:00
Eelco Dolstra
ec55562ec3 * Move the configuration of the pwdutils (passwd, useradd etc.) to
modules/programs/pwdutils.
* Renamed config.system.shell to config.users.defaultUserShell and
  updated the description to make clear it has to be a non-store
  path.

svn path=/nixos/branches/modular-nixos/; revision=15761
2009-05-28 12:24:56 +00:00
Eelco Dolstra
dfe03fc7f9 * This file has been unused for a long time AFAIK.
svn path=/nixos/branches/modular-nixos/; revision=15760
2009-05-28 12:21:48 +00:00
Eelco Dolstra
421dcc35c5 * Moved the Bash configuration to modules/programs/bash.
svn path=/nixos/branches/modular-nixos/; revision=15759
2009-05-28 12:06:54 +00:00
Eelco Dolstra
3badebea95 * Move /etc/issue to the mingetty module.
svn path=/nixos/branches/modular-nixos/; revision=15758
2009-05-28 11:34:46 +00:00
Eelco Dolstra
2d7beac377 * New directory modules/programs that contains system-wide
configuration for specific programs.  For instance, ssh.nix provides
  the configuration for the SSH client; ssmtp.nix provides the
  configuration for the `ssmtp' MTA.

svn path=/nixos/branches/modular-nixos/; revision=15757
2009-05-27 23:59:14 +00:00