Shea Levy
bb5d2d53fe
try isn't used, so use the more compatct seq 10
2012-06-27 09:43:54 -04:00
Mathijs Kwik
061a998840
luks root: c-style for-loop -> seq
...
The ash shell no longer supports this bash-specific syntax.
This left systems that use luksroot unable to boot.
2012-06-27 09:42:55 -04:00
Eelco Dolstra
e64bdda52b
Don't use weird 777 permissions on unmounted /dev/shm
2012-06-27 09:35:53 -04:00
Eelco Dolstra
cc357c7e64
nixos-rebuild: Add a convenience option ‘--upgrade’
...
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra
7613ae950a
Fix booting on EC2
...
The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
2012-06-24 19:02:34 -04:00
Eelco Dolstra
bd0f065c05
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 18:20:26 -04:00
Eelco Dolstra
6bd32f0a27
Drop the socat wrapper
2012-06-22 15:37:22 -04:00
Eelco Dolstra
1da7cea223
Add Busybox to the installation CD
...
This is mostly to get the automated tests to succeed.
2012-06-22 14:16:55 -04:00
Eelco Dolstra
980ba4d5a5
stage-1: mount /proc, /sys, /dev in the target root
...
The switch_root in BusyBox doesn't do this (while the one in
util-linux does). So we have to do this ourselves.
2012-06-22 13:51:42 -04:00
Eelco Dolstra
598adfee3e
Fix booting from the CD-ROM
...
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM. We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin. So make sure
the "iso9660" module is loaded.
2012-06-22 11:55:23 -04:00
Eelco Dolstra
7b54922227
Don't include klibc in the installation CD
2012-06-22 11:39:27 -04:00
Eelco Dolstra
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
Eelco Dolstra
9692495df0
Use BusyBox in the initrd
...
Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd. In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots. It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
2012-06-22 10:43:06 -04:00
Eelco Dolstra
70089950d2
nixos-version: "pre-svn" -> "pre-git"
2012-06-22 10:28:06 -04:00
Rob Vermaas
df124ebc89
* Make sure time.timeZone can only be defined once.
2012-06-21 12:47:44 +02:00
Eelco Dolstra
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
Eelco Dolstra
337423af8e
Backdoor: depend on /dev/hvc0
...
Systemd is the shit: units can declare a dependency on the appearance
of device nodes. Yay!
2012-06-19 17:36:02 -04:00
Eelco Dolstra
2fa1ba85c6
Enable the systemd password agents
2012-06-19 17:02:54 -04:00
Eelco Dolstra
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00
Eelco Dolstra
d692a0807a
Don't mount /dev/pts since systemd does that for us
2012-06-19 15:25:56 -04:00
Eelco Dolstra
cacd608c37
Mount devtmpfs in the initrd
...
It seems that udev now requires devtmpfs, so enable it.
2012-06-19 15:15:40 -04:00
Eelco Dolstra
cd7872b758
Drop dependency on the old udev
2012-06-19 15:14:54 -04:00
Eelco Dolstra
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
Eelco Dolstra
2b305d7f29
Remove accidentally committed line
2012-06-19 14:50:23 -04:00
Eelco Dolstra
f213c4ca29
Don't run syslogd and klogd
...
The systemd journal removes the need for running syslogd and klogd, so
don't start them.
2012-06-19 09:28:04 -04:00
Eelco Dolstra
88f94d76bc
Use socket-based activation of the Nix daemon
2012-06-18 23:31:07 -04:00
Eelco Dolstra
c73d642db2
Don't put quotes around environment values
2012-06-18 23:30:26 -04:00
Eelco Dolstra
c3fb248bcb
Get rid of the Upstart shutdown job
...
The only thing that Upstart's shutdown job did that systemd doesn't do
natively is update the hardware clock. So added a service for that.
2012-06-18 18:15:34 -04:00
Eelco Dolstra
ca2bd17f54
Whitespace
2012-06-18 17:58:31 -04:00
Eelco Dolstra
9f5051b76c
Rename mingetty module to agetty
2012-06-18 17:55:27 -04:00
Eelco Dolstra
4c21857ee1
Upstart ‘boot.systemd.services’ for the Upstart compatibility layer
2012-06-18 17:42:26 -04:00
Eelco Dolstra
352510c208
Add an option ‘boot.systemd.services’
...
This option makes it more convenient to define services because it
automates stuff like setting $PATH, having a pre-start script, and so on.
2012-06-18 15:28:31 -04:00
Eelco Dolstra
673bf12b1d
Improve the dependencies of units generated by the Upstart emulation
2012-06-18 00:22:18 -04:00
Eelco Dolstra
42ee3b4209
Add a ‘wantedBy’ attribute to unit definitions
...
This attribute allows a unit to make itself a dependency of another unit.
Also, add an option to set the default target unit.
2012-06-17 23:31:21 -04:00
Mathijs Kwik
bd5b06bf86
synaptics driver: accelleration factor config option
...
svn path=/nixos/trunk/; revision=34523
2012-06-16 11:13:48 +00:00
Eelco Dolstra
4a95f8996b
To ease migration to systemd, generate units from the ‘jobs’ option
...
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
2012-06-16 00:19:43 -04:00
Eelco Dolstra
66f4d10843
Use pam_systemd.so to set up device ownership
...
This removes the need for ConsoleKit, so it's gone.
2012-06-15 14:51:48 -04:00
Eelco Dolstra
ab86759eb3
Use kmod instead of module-init-tools
2012-06-15 14:18:26 -04:00
Eelco Dolstra
164d6e6ab2
Use udev from systemd
2012-06-15 13:09:22 -04:00
Eelco Dolstra
a46894b960
Get lots more systemd stuff working
...
Enabled a bunch of units that ship with systemd. Also added an option
‘boot.systemd.units’ that can be used to define additional units
(e.g. ‘sshd.service’).
2012-06-14 18:44:56 -04:00
Eelco Dolstra
c9be63b83e
* Use ‘nologin’ as the default shell for user accounts that are not
...
allowed to log in.
svn path=/nixos/trunk/; revision=34514
2012-06-14 21:33:59 +00:00
Eelco Dolstra
fae777c264
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-14 12:02:17 -04:00
Eelco Dolstra
fd9604b319
* Oops, fix an incomplete commit.
...
svn path=/nixos/trunk/; revision=34488
2012-06-13 03:28:03 +00:00
Eelco Dolstra
63517eca1b
* Actually use the security.pam.enableSSHAgentAuth option.
...
http://hydra.nixos.org/build/2698800
svn path=/nixos/trunk/; revision=34483
2012-06-12 20:21:15 +00:00
Eelco Dolstra
15d44498f9
* Add a ‘size’ option to ‘swapDevices’ to create swapfiles on the fly.
...
svn path=/nixos/trunk/; revision=34478
2012-06-12 13:41:51 +00:00
Eelco Dolstra
03653d43eb
* Add support for sudo authentication using the SSH agent. This
...
allows password-less servers.
svn path=/nixos/trunk/; revision=34474
2012-06-11 22:41:07 +00:00
Eelco Dolstra
a3118792a5
* Make the ACPI Shutdown command in VirtualBox to do the right thing.
...
svn path=/nixos/trunk/; revision=34473
2012-06-11 22:37:55 +00:00
Lluís Batlle i Rossell
a257bf78cb
Making the virtualbox-guest module be evaluated only in i686 and x86_64.
...
On mips, an assertion in the nixpkgs virtualbox was failing.
svn path=/nixos/trunk/; revision=34464
2012-06-11 17:31:03 +00:00
Peter Simons
51b5da4023
modules/security/pam.nix: sort security.pam.services alphabetically
...
svn path=/nixos/trunk/; revision=34437
2012-06-11 07:12:41 +00:00
Peter Simons
5c3593be46
Add PAM configuration for vlock.
...
svn path=/nixos/trunk/; revision=34436
2012-06-11 07:12:39 +00:00
Peter Simons
4c54fcaf45
pam security for i3lock
...
svn path=/nixos/trunk/; revision=34435
2012-06-11 07:10:25 +00:00
Peter Simons
25155a02e6
Add findutils dependency for /tmp cleaning.
...
This dependency is only added if the setting is activated.
svn path=/nixos/trunk/; revision=34434
2012-06-11 07:05:15 +00:00
Peter Simons
4931188684
Integrate cleanTmpDir in stage-2-init.sh.
...
We're using find in order to remove dotfiles, too.
svn path=/nixos/trunk/; revision=34433
2012-06-11 07:05:13 +00:00
Peter Simons
fbf53168f3
Add new option config.boot.cleanTmpDir.
...
This option is to control if the user wants to have its /tmp directory cleaned
up during system boot.
svn path=/nixos/trunk/; revision=34432
2012-06-11 07:05:11 +00:00
Lluís Batlle i Rossell
9125d3af50
Adding creation of /dev/ptmx in stage-2, in case stage-1 did not run.
...
Upstart requires /dev/ptmx since its 1.4, and will lock up in case of it missing.
I was hitting this in the fuloong, where I don't use the nixos initrd.
svn path=/nixos/trunk/; revision=34429
2012-06-10 22:37:20 +00:00
Lluís Batlle i Rossell
3d2ed19067
Making fcron use the daemonType=fork, instead of foreground. This way logrotate
...
does not have to handle it appart.
svn path=/nixos/trunk/; revision=34422
2012-06-10 15:14:16 +00:00
Lluís Batlle i Rossell
6824f1e082
Making the dovecot2 mail location a nixos option.
...
svn path=/nixos/trunk/; revision=34421
2012-06-10 15:07:25 +00:00
Lluís Batlle i Rossell
9b833aafb9
Fix prayer so it does not start a server at port 80.
...
svn path=/nixos/trunk/; revision=34420
2012-06-10 14:51:43 +00:00
Lluís Batlle i Rossell
78333e5d84
Add a 'named' option to run only for ipv4.
...
I remember the 'named' log was giving annoying messages on systems not ipv6
capable (I can't recall if lacking the kernel ipv6 code or unconfigured ipv6
addresses).
svn path=/nixos/trunk/; revision=34419
2012-06-10 14:50:44 +00:00
Lluís Batlle i Rossell
31f30722d6
Small comment fix on the system-tarball-sheevaplug.
...
svn path=/nixos/trunk/; revision=34418
2012-06-10 14:45:30 +00:00
Lluís Batlle i Rossell
c539224a84
Postfix was started before all filesystems were mounted. I add 'filesystem' to startOn.
...
svn path=/nixos/trunk/; revision=34416
2012-06-10 14:36:16 +00:00
Eelco Dolstra
87e06b97a3
* Don't include the hostname in option default values. Default values
...
are included in the manual, so this causes a different manual to be
built for each machine.
* Clean up indentation of cntlm module.
svn path=/nixos/trunk/; revision=34387
2012-06-08 14:29:31 +00:00
Eelco Dolstra
6aa4120f3a
* Shorten the greeting line to make it fit on a 80-character terminal
...
again by removing the kernel version.
svn path=/nixos/trunk/; revision=34376
2012-06-06 23:14:57 +00:00
Eelco Dolstra
593eb83343
* Typo.
...
svn path=/nixos/trunk/; revision=34369
2012-06-06 15:23:20 +00:00
aszlig
b78ce79f89
Add xserver integration of i3 WM.
...
This allows to set i3 as the default window manager in the system configuration.
2012-06-04 21:19:12 +02:00
Eelco Dolstra
f21aa7d22c
First attempt at using systemd
...
Basic booting works. Systemd starts agetty instances on tty1 and
tty2. Shutdown and journald also work.
2012-06-04 12:51:48 -04:00
Eelco Dolstra
f2a33809c1
* Check for .git instead of .svn.
...
svn path=/nixos/trunk/; revision=34350
2012-06-04 15:57:32 +00:00
Eelco Dolstra
a0cc181117
* nixos-checkout: get the NixOS/Nixpkgs sources from GitHub.
...
svn path=/nixos/trunk/; revision=34347
2012-06-04 15:39:07 +00:00
Eelco Dolstra
c4c68f97d1
* The volume ID is too long again. Shorten it to make it fit (just
...
barely) inside the 32 character limit.
http://hydra.nixos.org/build/2660387
svn path=/nixos/trunk/; revision=34346
2012-06-04 15:02:37 +00:00
Eelco Dolstra
ca57a8e638
* Add type.
...
svn path=/nixos/trunk/; revision=34345
2012-06-04 14:35:48 +00:00
Eelco Dolstra
9b014c471a
* CUPS: fix printing on a Ricoh Aficio MP C4500 PXL printer (and
...
probably lots of others). The $PATH used to invoke the filter
didn't contain Ghostscript and Perl, so it silently fails. (A nice
property of CUPS is that it will just silently discard the job when
that happens, so you need to set LogLevel to "debug" to see this.)
Fortunately, CUPS now has a "SetEnv" option to set $PATH explicitly.
Also, remove config.system.path from the PATH of CUPS' Upstart job.
It seems to serve no purpose.
svn path=/nixos/trunk/; revision=34244
2012-05-25 15:51:33 +00:00
Eelco Dolstra
f81eb12d41
* Now hopefully a proper fix for the problem in
...
http://hydra.nixos.org/build/2645533 (which I can't reproduce btw -
so much for reproducibility...).
svn path=/nixos/trunk/; revision=34243
2012-05-25 14:06:46 +00:00
Eelco Dolstra
d0786fd3e7
* Cache nix-pull calls in nixos-install.
...
svn path=/nixos/trunk/; revision=34241
2012-05-25 13:32:30 +00:00
Lluís Batlle i Rossell
22fc2bdb24
Fixing the evaluation of the system-tarball-pc.
...
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.
svn path=/nixos/trunk/; revision=34238
2012-05-25 08:09:25 +00:00
Lluís Batlle i Rossell
4157166f8a
Making the sheevaplug system tarball evaluate fine again. It had some pieces not up to date:
...
fileSystems definition, kernel version, ...
svn path=/nixos/trunk/; revision=34237
2012-05-25 07:52:12 +00:00
Eelco Dolstra
a3e04ba0aa
* Fix problems with repeated installations due to the immutable bit
...
(http://hydra.nixos.org/build/2645533 ).
svn path=/nixos/trunk/; revision=34235
2012-05-25 02:30:52 +00:00
Eelco Dolstra
b11770373a
* Work properly if /root/.nix-defexpr/channels already exists.
...
svn path=/nixos/trunk/; revision=34233
2012-05-24 23:37:06 +00:00
Eelco Dolstra
a6892051ef
* Allow building with boot.loader.grub.enable set to "false".
...
svn path=/nixos/trunk/; revision=34218
2012-05-23 15:52:29 +00:00
Eelco Dolstra
9dadfc3541
* Mark QEMU VMs as NixOS machines.
...
svn path=/nixos/trunk/; revision=34217
2012-05-23 15:40:31 +00:00
Rob Vermaas
53af6f5668
Execute mount-all task on config-changed event to make sure it is performed before other upstart jobs are started on activating the new configuration.
...
svn path=/nixos/trunk/; revision=34201
2012-05-21 21:26:45 +00:00
Mathijs Kwik
be69799f35
better workaround for building nested child configurations
...
svn path=/nixos/trunk/; revision=34164
2012-05-18 06:17:08 +00:00
Mathijs Kwik
7fca5408f3
Revert "Provided a workaround for grub's missing-devices check, so nested child configurations can still build."
...
This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.
svn path=/nixos/trunk/; revision=34163
2012-05-18 06:17:05 +00:00
Eelco Dolstra
2577a17468
* Add /etc/os-release to be Lennart Poettering compliant.
...
See http://0pointer.de/blog/projects/os-release.html
svn path=/nixos/trunk/; revision=34162
2012-05-17 21:10:42 +00:00
Eelco Dolstra
801cd7402c
* Don't use ‘chown user.group’ since that syntax is not officially
...
supported (you're supposed to say ‘chown user:group’).
svn path=/nixos/trunk/; revision=34161
2012-05-17 19:43:32 +00:00
Eelco Dolstra
f889ebc488
* Allow runtime changes to boot.devShmSize and friends.
...
svn path=/nixos/trunk/; revision=34160
2012-05-17 19:33:55 +00:00
Eelco Dolstra
e9e6885d3b
* Lower the limits on /run and /dev.
...
svn path=/nixos/trunk/; revision=34159
2012-05-17 19:33:12 +00:00
Eelco Dolstra
91acb81b11
* Support globbing in the source attribute of environment.etc entries.
...
svn path=/nixos/trunk/; revision=34158
2012-05-17 18:43:45 +00:00
Eelco Dolstra
c10b41ad99
* Make the fail2ban module configurable.
...
svn path=/nixos/trunk/; revision=34157
2012-05-17 18:19:48 +00:00
Mathijs Kwik
88b3c4b82e
Provided a workaround for grub's missing-devices check, so nested child configurations can still build.
...
svn path=/nixos/trunk/; revision=34153
2012-05-17 10:17:32 +00:00
Eelco Dolstra
3ce8859551
* Basic module for fail2ban. Not configurable yet. It currently
...
blocks IP addresses if they make too many failed login attempts.
svn path=/nixos/trunk/; revision=34149
2012-05-17 02:51:24 +00:00
Eelco Dolstra
a9a507eede
* On headless systems, disable the emergency shell and redirect
...
mountall output to the standard Upstart job log file
(/var/log/upstart/mountall).
svn path=/nixos/trunk/; revision=34138
2012-05-16 15:08:44 +00:00
Eelco Dolstra
6a6eec0f53
* Add a filesystem option ‘autoFormat’ to automatically do a format if
...
the device has no filesystem yet. Useful in Charon deployments.
The check for an uninitialised filesystem is kind of shaky now.
svn path=/nixos/trunk/; revision=34133
2012-05-16 00:03:44 +00:00
Eelco Dolstra
07fcf5baee
* Make the boot.initrd.luks.enable option obsolete. It's enough to
...
see that boot.initrd.luks.devices is non-empty.
svn path=/nixos/trunk/; revision=34120
2012-05-15 20:45:01 +00:00
Eelco Dolstra
dbf5e3229e
* Remove Nix's dependencies from the chroot. Nix 1.0 doesn't need
...
this anymore.
svn path=/nixos/trunk/; revision=34113
2012-05-15 16:12:22 +00:00
Eelco Dolstra
560262dae0
* Fix "error: the group nixbld' specified in
build-users-group' does
...
not exist" during nixos-install.
svn path=/nixos/trunk/; revision=34103
2012-05-15 13:50:36 +00:00
Eelco Dolstra
ea3cfc9287
* Add xdg-open to the default X11 configuration so that programs like
...
Chrome can open downloaded files.
svn path=/nixos/trunk/; revision=34097
2012-05-15 02:49:47 +00:00
Eelco Dolstra
3b314fa40b
* Include cryptsetup in EC2 AMIs.
...
svn path=/nixos/trunk/; revision=34096
2012-05-14 23:43:38 +00:00
Eelco Dolstra
29b05fb62a
* nixos-checkout: add an argument to specify the directory where the
...
sources should be stored. E.g. "nixos-checkout /home/eelco/srcs"
will check out to /home/eelco/srcs/{nixos,nixpkgs}. Probably the
/etc/nixos default should be removed eventually because /etc is a
pretty weird place to keep large source trees.
svn path=/nixos/trunk/; revision=34086
2012-05-14 04:12:43 +00:00
Eelco Dolstra
8d568e5a71
* nixos-option: clean up the English and the generated file.
...
svn path=/nixos/trunk/; revision=34082
2012-05-14 01:56:42 +00:00
Eelco Dolstra
3dd0718939
* Give an error at evaluation time if boot.loader.grub.device or
...
boot.loader.grub.devices are not set, rather than complaining about
it when it's too late.
svn path=/nixos/trunk/; revision=34081
2012-05-14 01:53:47 +00:00