bf15293b1e
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/services/hardware/udev.nix
2012-06-28 14:19:38 -04:00
76c74cd7c7
initrd: Detect filesystem type before doing fsck/mount
...
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded. Therefore, use blkid to
determine the filesystem type.
Also generate an /etc/fstab in the initrd rootfs on the fly. This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
2012-06-28 10:55:44 -04:00
7acfd8ec20
Merge pull request #9 from viric/pull-pipefail
...
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-28 01:20:22 -07:00
34e8f68056
system-tarball-pc: not use boot.initrd.extraTools anymore
...
Eelco removed the option recently, making the default initrd have the full
busybox.
I saw this evaluation error in the hydra nixos trunk page.
2012-06-27 22:26:27 +02:00
de87b07bb3
nixos-rebuild: fail if any case of pull fails.
2012-06-27 21:57:15 +02:00
5b7c019e2a
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-27 21:36:46 +02:00
dbe2325603
fix the grep pattern finding programs called by absolute paths in udev rules.
2012-06-27 20:41:07 +02:00
bb5d2d53fe
try isn't used, so use the more compatct seq 10
2012-06-27 09:43:54 -04:00
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
e64bdda52b
Don't use weird 777 permissions on unmounted /dev/shm
2012-06-27 09:35:53 -04:00
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
a85555cd27
Remove the obsolete --no-pull option from the nixos-rebuild man page
2012-06-25 16:08:19 -04:00
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
bd0f065c05
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 18:20:26 -04:00
6bd32f0a27
Drop the socat wrapper
2012-06-22 15:37:22 -04:00
82019c01bb
Test driver: exit when all VMs have exited rather than sleeping forever
2012-06-22 14:31:07 -04:00
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
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
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
7b54922227
Don't include klibc in the installation CD
2012-06-22 11:39:27 -04:00
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
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
70089950d2
nixos-version: "pre-svn" -> "pre-git"
2012-06-22 10:28:06 -04:00
df124ebc89
* Make sure time.timeZone can only be defined once.
2012-06-21 12:47:44 +02:00
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
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
2fa1ba85c6
Enable the systemd password agents
2012-06-19 17:02:54 -04:00
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00
d692a0807a
Don't mount /dev/pts since systemd does that for us
2012-06-19 15:25:56 -04:00
cacd608c37
Mount devtmpfs in the initrd
...
It seems that udev now requires devtmpfs, so enable it.
2012-06-19 15:15:40 -04:00
cd7872b758
Drop dependency on the old udev
2012-06-19 15:14:54 -04:00
dab6bbe3a6
Set the default unit to "graphical.target" if X11 is enabled
2012-06-19 14:51:04 -04:00
2b305d7f29
Remove accidentally committed line
2012-06-19 14:50:23 -04:00
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
88f94d76bc
Use socket-based activation of the Nix daemon
2012-06-18 23:31:07 -04:00
c73d642db2
Don't put quotes around environment values
2012-06-18 23:30:26 -04:00
13c690b721
Add a .gitignore
2012-06-18 18:16:38 -04:00
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
ca2bd17f54
Whitespace
2012-06-18 17:58:31 -04:00
9f5051b76c
Rename mingetty module to agetty
2012-06-18 17:55:27 -04:00
4c21857ee1
Upstart ‘boot.systemd.services’ for the Upstart compatibility layer
2012-06-18 17:42:26 -04:00
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
673bf12b1d
Improve the dependencies of units generated by the Upstart emulation
2012-06-18 00:22:18 -04:00
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
bd5b06bf86
synaptics driver: accelleration factor config option
...
svn path=/nixos/trunk/; revision=34523
2012-06-16 11:13:48 +00:00
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
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
ab86759eb3
Use kmod instead of module-init-tools
2012-06-15 14:18:26 -04:00
164d6e6ab2
Use udev from systemd
2012-06-15 13:09:22 -04:00
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
viric
David Guibert
Shea Levy
Mathijs Kwik
Rob Vermaas
Eelco Dolstra