Eelco Dolstra
262ddf0854
* Move the manual/Rogue from virtual consoles 7/8 to 8/9
...
respectively so that the X server can run on 7.
svn path=/nixos/branches/modular-nixos/; revision=15924
2009-06-10 12:53:45 +00:00
Eelco Dolstra
135240e05f
* Sigh. The nix-env call has to come after nix-store --load-db.
...
Should really allow an ordering between postBootCommands.
svn path=/nixos/branches/modular-nixos/; revision=15923
2009-06-10 12:51:16 +00:00
Eelco Dolstra
463cf8efdd
* Provide a /etc/nixos/configuration.nix in the booted CD to make
...
nixos-rebuild work. This makes it a true live CD.
svn path=/nixos/branches/modular-nixos/; revision=15922
2009-06-10 12:34:58 +00:00
Eelco Dolstra
56922fa5b1
* Removed the installer directory.
...
svn path=/nixos/branches/modular-nixos/; revision=15918
2009-06-10 11:02:17 +00:00
Eelco Dolstra
1f8602afd2
* Get rid of the old CD/DVD expressions. live-dvd.nix is basically
...
rescue-dvd.nix (not tested though), i.e. it has all its extra
packages and includes the build-time dependencies.
svn path=/nixos/branches/modular-nixos/; revision=15917
2009-06-10 11:00:29 +00:00
Eelco Dolstra
ba43b5d000
* Set the CD volume ID and the ISO filename.
...
svn path=/nixos/branches/modular-nixos/; revision=15912
2009-06-09 15:23:03 +00:00
Eelco Dolstra
803d8b646f
* Option isoImage.storeContents to add extra paths to the Nix store on
...
the CD.
svn path=/nixos/branches/modular-nixos/; revision=15906
2009-06-09 13:27:50 +00:00
Eelco Dolstra
45e6fe420c
svn path=/nixos/branches/modular-nixos/; revision=15905
2009-06-09 13:14:43 +00:00
Eelco Dolstra
6023722135
* Provide Memtest86 as a module.
...
svn path=/nixos/branches/modular-nixos/; revision=15904
2009-06-09 12:02:52 +00:00
Eelco Dolstra
37edcf4fae
* Provide an option to add more files to the ISO image.
...
svn path=/nixos/branches/modular-nixos/; revision=15903
2009-06-09 12:01:31 +00:00
Eelco Dolstra
ca061eb628
* Include the NixOS/Nixpkgs trees on the CD.
...
svn path=/nixos/branches/modular-nixos/; revision=15897
2009-06-08 22:45:45 +00:00
Eelco Dolstra
b7cad3c059
* Style fix.
...
svn path=/nixos/branches/modular-nixos/; revision=15896
2009-06-08 22:44:59 +00:00
Eelco Dolstra
42513650d8
svn path=/nixos/branches/modular-nixos/; revision=15895
2009-06-08 22:44:05 +00:00
Eelco Dolstra
606a8c87a1
svn path=/nixos/branches/modular-nixos/; revision=15894
2009-06-08 22:43:41 +00:00
Eelco Dolstra
eb8b534173
* Include only the en_US locale on the CD. This saves 75 MiB or so.
...
svn path=/nixos/branches/modular-nixos/; revision=15883
2009-06-05 17:19:30 +00:00
Eelco Dolstra
dbe229f3aa
* $LOCALE_ARCHIVE needs to be set, otherwise the "locale" command will
...
fail and the ttys won't initialised in Unicode mode.
svn path=/nixos/branches/modular-nixos/; revision=15882
2009-06-05 17:18:20 +00:00
Eelco Dolstra
86509aa159
* Output the manual as XHTML. This also sets the charset correctly.
...
svn path=/nixos/branches/modular-nixos/; revision=15881
2009-06-05 17:16:42 +00:00
Eelco Dolstra
0a0260514d
* Renamed boot.localCommands to boot.postBootCommands since it wasn't
...
such a good name (local to what?).
svn path=/nixos/branches/modular-nixos/; revision=15879
2009-06-05 16:02:58 +00:00
Eelco Dolstra
5cf8604b1e
* Module that contains the configuration for the NixOS installation CD
...
(not yet complete).
svn path=/nixos/branches/modular-nixos/; revision=15878
2009-06-05 15:10:15 +00:00
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
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
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
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