mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
2668 commits 218 branches 122 tags 7.1 GiB
Commit graph

969 commits

Author SHA1 Message Date
Eelco Dolstra f729f12e4e Some cleanups in the activation script: 
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
 2010-09-13 15:41:38 +00:00
Eelco Dolstra f99e42cfbc * Doh. 
svn path=/nixos/trunk/; revision=23748
 2010-09-13 13:43:53 +00:00
Eelco Dolstra c1295661c4 * Added a command `nixos-rebuild build-vm-with-bootloader'. This is 
like `build-vm', but boots using the regular boot loader (i.e. GRUB
  1 or 2) rather than booting directly from the kernel/initrd.  Thus
  it allows testing of GRUB.

svn path=/nixos/trunk/; revision=23747
 2010-09-13 12:34:58 +00:00
Eelco Dolstra b756a1ee81 * Added an option to disable fsck on particular filesystems. 
svn path=/nixos/trunk/; revision=23744
 2010-09-13 11:46:35 +00:00
Eelco Dolstra e871e84159 * mkOverrideTemplate -> mkOverride. 
svn path=/nixos/trunk/; revision=23743
 2010-09-13 11:33:05 +00:00
Eelco Dolstra 6b2844c6b2 * Mount /proc/xen. 
svn path=/nixos/trunk/; revision=23741
 2010-09-12 22:56:54 +00:00
Eelco Dolstra 987dd76811 * Added a module to enable the Xen hypervisor. 
svn path=/nixos/trunk/; revision=23739
 2010-09-12 22:43:45 +00:00
Evgeny Egorochkin 9f06fb806c Fix TOR option descriptions: kbytes-> bytes 
svn path=/nixos/trunk/; revision=23735
 2010-09-11 11:43:09 +00:00
Eelco Dolstra 8edefa2960 * Grrr. Fix the sort order. 
svn path=/nixos/trunk/; revision=23732
 2010-09-10 17:35:13 +00:00
Eelco Dolstra 4ae4b7d47f * Support booting Xen in the Grub menu builder. 
svn path=/nixos/trunk/; revision=23730
 2010-09-10 17:15:35 +00:00
Eelco Dolstra 8f4139987e * Regex listing the system generations was selecting the number from 
only the first generation in the list.  (From Karn Kallio.)

svn path=/nixos/trunk/; revision=23728
 2010-09-10 15:47:06 +00:00
Eelco Dolstra 6258845b61 svn path=/nixos/trunk/; revision=23727 2010-09-10 15:25:58 +00:00
Eelco Dolstra 7b635ee4ed * "ls -d" -> "echo", since "ls" prints the current directory if 
nothing matches.

svn path=/nixos/trunk/; revision=23716
 2010-09-10 12:25:59 +00:00
Sander van der Burg 10a3bd6ffe Added virtualbox service, which fixes the RandR problem and also keeps the guest's clock in sync with the host 
svn path=/nixos/trunk/; revision=23672
 2010-09-07 13:28:17 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
 2010-09-03 19:10:59 +00:00
Nicolas Pierron 1f69bc4b9d Remove deprecated notation in tools.nix. 
svn path=/nixos/trunk/; revision=23630
 2010-09-03 19:10:54 +00:00
Nicolas Pierron 9e04f67b3d Add nixos-option tool to investigate option details on the cmd-line. 
svn path=/nixos/trunk/; revision=23629
 2010-09-03 19:10:50 +00:00
Nicolas Pierron 6fa66ff7b9 Move matches just below the identifier. 
svn path=/nixos/trunk/; revision=23628
 2010-09-03 19:10:45 +00:00
Eelco Dolstra f1a6a8b6e0 svn path=/nixos/trunk/; revision=23614 2010-09-03 11:39:48 +00:00
Eelco Dolstra d550cc6d63 * Grmbl. Create the missing mount points. 
svn path=/nixos/trunk/; revision=23592
 2010-09-01 11:00:35 +00:00
Eelco Dolstra 2ac462c3c7 * Set NIX_CONF_DIR in cronjobs. Otherwise the garbage collector won't see 
the system nix.conf.

svn path=/nixos/trunk/; revision=23561
 2010-08-31 12:57:47 +00:00
Eelco Dolstra 68ebbb6093 * Put /nix on /ephemeral0 using AUFS (with the original /nix from the 
AMI as a base) because the root filesystem is rather small.

svn path=/nixos/trunk/; revision=23534
 2010-08-29 22:29:10 +00:00
Eelco Dolstra 34719e0c4a * On second thought, panicking in stage 1 doesn't help because it 
won't actually cause the instance to be terminated (even if
  "panic=1" were to be set), merely rebooted.

svn path=/nixos/trunk/; revision=23533
 2010-08-29 22:11:33 +00:00
Eelco Dolstra a242602b40 * /data -> /ephemeral0. 
* Put /tmp and /var on the /ephemeral0, as it has much more
  space than the root filesystem.
* Panic on stage 1 errors since they cannot be repaired anyway.

svn path=/nixos/trunk/; revision=23532
 2010-08-29 22:09:15 +00:00
Eelco Dolstra 4963f769d9 * Print the host public key on the console so that the user can obtain 
it securely by parsing the output of ec2-get-console-output.

svn path=/nixos/trunk/; revision=23524
 2010-08-29 21:03:22 +00:00
Michael Raskin 597e083d82 Adding an option to include build dependencies into ISO image 
svn path=/nixos/trunk/; revision=23502
 2010-08-29 12:11:31 +00:00
Eelco Dolstra 59b29535e5 * Include the Bluetooth module in module-list.nix. 
svn path=/nixos/trunk/; revision=23486
 2010-08-27 15:32:49 +00:00
Eelco Dolstra 4bca743766 * Typo. 
svn path=/nixos/trunk/; revision=23485
 2010-08-27 15:31:04 +00:00
Eelco Dolstra f067d179ab * Create /nix/var/nix/gcroots/tmp in the activation script. The 
build hook uses this directory to store temporary GC roots.  (It
  creates it if it doesn't exist, but it's better to do it here as
  well to ensure the right ownership and permissions.)
* Clear /nix/var/nix/gcroots/tmp and /nix/var/nix/temproots at boot
  time.

svn path=/nixos/trunk/; revision=23417
 2010-08-25 11:59:04 +00:00
Lluís Batlle i Rossell 63c3d72aa6 Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current 
*two* possibilities of nvidia legacy driver in nixpkgs.


svn path=/nixos/trunk/; revision=23412
 2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell 1e7058d025 Removing the NvAGP special option for nvidiaLegacy. Although it helped in 
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.

I'll leave that up to the nixos user with the cfg.deviceSection.


svn path=/nixos/trunk/; revision=23407
 2010-08-24 18:24:06 +00:00
Eelco Dolstra 3f10cf70f6 * Regression test for the build hook mechanism. 
svn path=/nixos/trunk/; revision=23395
 2010-08-24 13:27:28 +00:00
Eelco Dolstra 392275f185 * Move support for writable Nix stores to qemu-vm.nix. 
svn path=/nixos/trunk/; revision=23393
 2010-08-24 12:59:16 +00:00
Lluís Batlle i Rossell fe2f7eae17 Making the stage1 work on mips too (for the name of the dynamic loader) 
svn path=/nixos/trunk/; revision=23325
 2010-08-21 18:23:55 +00:00
Yury G. Kudryashov a7d7f1630f Will move digikam outside of kde4 in kde4.5, so change example 
svn path=/nixos/trunk/; revision=23266
 2010-08-19 23:07:14 +00:00
Eelco Dolstra 4c8fb8d4b2 * The "atd" job tends to fail randomly on startup for unknown 
reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
 2010-08-19 14:50:48 +00:00
Eelco Dolstra c55f496c52 * The ALSA job shouldn't be started until udevtrigger has finished. 
Otherwise the sound card drivers may not have been loaded yet, and
  restoring the mixer settings will fail.  Also, since the ALSA job
  itself will fail, it won't save the mixer settings on shutdown.

svn path=/nixos/trunk/; revision=23245
 2010-08-19 11:55:52 +00:00
Rob Vermaas e87a298c33 qemu virtualiztion: do not pass username on guest cifs mount, use sec=none in stead 
svn path=/nixos/trunk/; revision=23243
 2010-08-19 08:32:31 +00:00
Eelco Dolstra 1fcefe39a1 * Add share/emacs to the paths to symlink. 
svn path=/nixos/trunk/; revision=23184
 2010-08-16 08:00:18 +00:00
Eelco Dolstra 751ec4f845 * Xfce requires desktop-file-utils to create/update .desktop files. 
svn path=/nixos/trunk/; revision=23183
 2010-08-16 07:48:06 +00:00
Michael Raskin 295df77f21 Move resume section after udev launch - on some systems devices are recognized by kernel only after udev works. 
svn path=/nixos/trunk/; revision=23176
 2010-08-14 20:12:05 +00:00
Yury G. Kudryashov f0eb823a34 Add unix_chkpwd suid wrapper 
svn path=/nixos/trunk/; revision=23165
 2010-08-13 14:07:34 +00:00
Eelco Dolstra cfb465c7a5 svn path=/nixos/trunk/; revision=23115 2010-08-11 15:10:17 +00:00
Eelco Dolstra 2ec105cc85 * Separate building of the NixOS manual and manpages. Usually we only 
need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
 2010-08-11 12:28:53 +00:00
Eelco Dolstra 2e0a569187 * Use InputClass in the synaptics module to automatically use the 
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
  *Edge (usually auto-detected), Protocol (use auto-detect instead).

svn path=/nixos/trunk/; revision=23092
 2010-08-10 14:13:57 +00:00
Eelco Dolstra 5456815016 * Re-enable ctrl-alt-backspace to kill the X server. 
svn path=/nixos/trunk/; revision=23089
 2010-08-10 12:37:39 +00:00
Eelco Dolstra 313629adcf * Add ext4 to the default initrd. 
svn path=/nixos/trunk/; revision=23088
 2010-08-10 10:12:18 +00:00
Eelco Dolstra 8c960af984 * Handle the case where /boot is on the same filesystem as / 
but on a different filesystem than /nix/store.  In that case
  we need to copy the kernels and initrds to /boot.

svn path=/nixos/trunk/; revision=23085
 2010-08-10 08:36:59 +00:00
Eelco Dolstra cddc67a653 * Try to load the p4_clockmod kernel module, which provides 
CPU frequency scaling on some Intel CPUs.

svn path=/nixos/trunk/; revision=23082
 2010-08-10 01:00:09 +00:00
Eelco Dolstra 163a54886c * Include fontconfig in the system path (for fc-list, fc-match etc.). 
svn path=/nixos/trunk/; revision=23080
 2010-08-10 00:03:36 +00:00
Eelco Dolstra 8de6ab7dff * Enable the Xfce power manager. 
svn path=/nixos/trunk/; revision=23079
 2010-08-09 23:15:39 +00:00
Eelco Dolstra c388446bb0 * Xfce is now more or less functional. 
svn path=/nixos/trunk/; revision=23075
 2010-08-09 21:59:34 +00:00
Eelco Dolstra 31db968be4 * In QEMU, set a higher refresh rate in xorg.conf so that resolutions 
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
  the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
 2010-08-09 20:10:16 +00:00
Eelco Dolstra 057602f3f2 * Some subdirectories should always be symlinked in the system path 
when X11 is enabled (e.g. etc/xdg, share/icons...).

svn path=/nixos/trunk/; revision=23062
 2010-08-09 18:04:55 +00:00
Eelco Dolstra f6497fa576 * Use the proper Xfce session start script. Include the desktop and 
the panel.

svn path=/nixos/trunk/; revision=23055
 2010-08-09 11:51:44 +00:00
Eelco Dolstra fc8204c0e4 * Always symlink etc/dbus-1 and share/dbus-1 in the system path, not 
just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
 2010-08-09 11:42:32 +00:00
Eelco Dolstra e41e6a65bb * Make sure that /tmp/.ICE-unix is owned by root and has 1777 
permissions.  Otherwise it ends up being owned by the first user to
  log in, and other users' iceauth calls fail.

svn path=/nixos/trunk/; revision=23052
 2010-08-09 10:59:20 +00:00
Eelco Dolstra 5041cdddbd * Start of an Xfce desktop manager module. Currently it just starts 
Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
 2010-08-08 22:45:54 +00:00
Eelco Dolstra 6e118cd66b * Change the default desktop manager from "xterm" to the last imported 
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
 2010-08-08 14:05:32 +00:00
Eelco Dolstra 87dcdc05fe * Fix example. 
svn path=/nixos/trunk/; revision=23035
 2010-08-08 13:57:21 +00:00
Eelco Dolstra cbc05c1480 * Enable wpa_supplicant on the installation CD. 
svn path=/nixos/trunk/; revision=23034
 2010-08-08 13:55:35 +00:00
Eelco Dolstra 622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that 
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
 2010-08-08 12:39:00 +00:00
Eelco Dolstra e8e7ee356c * In the installation CD, pass the label of the CD through the 
root=... kernel command line parameter, instead of hard-coding it in
  `fileSystems'.  This is to allow CD-to-USB converters such as
  UNetbootin to rewrite the kernel command line to the label or UUID
  of the USB stick.

svn path=/nixos/trunk/; revision=23024
 2010-08-07 14:16:18 +00:00
Michael Raskin 3cab6d3e1c Fixing extra /bin/sh in the shell - noticed by Eelco Dolstra 
svn path=/nixos/trunk/; revision=23021
 2010-08-07 11:16:06 +00:00
Michael Raskin dec8079468 Fix stdenv reference 
svn path=/nixos/trunk/; revision=23020
 2010-08-07 10:26:37 +00:00
Eelco Dolstra d7d2d5e3d5 * Add some NLS modules required to mount FAT filesystems. We need 
this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
 2010-08-06 23:09:37 +00:00
Eelco Dolstra 05fc10f3a8 * Add dosfstools to the installation CD (for 
{mkfs,fsck}.{vfat,msdos}).

svn path=/nixos/trunk/; revision=23006
 2010-08-06 18:52:00 +00:00
Eelco Dolstra ea49707f85 * Run CUPS' external programs in the "lp" group so that they can 
access printer devices in /dev.  Also use a "cups" user instead of
  "nobody".

svn path=/nixos/trunk/; revision=23003
 2010-08-06 14:52:09 +00:00
David Guibert 6c8c1f935a nixos: authenticate through kerberos 
config.krb5.enable needs to be set as true.
Also use pam_ccreds to cache Kerberos credentials for offline logins.

svn path=/nixos/trunk/; revision=22986
 2010-08-06 08:50:48 +00:00
David Guibert 6436ed1de4 nixos: kerberos services for the server. 
svn path=/nixos/trunk/; revision=22985
 2010-08-06 08:49:08 +00:00
Eelco Dolstra 793767870a * Disable writing dhclient debug info to /tmp/dhcp-exit. 
svn path=/nixos/trunk/; revision=22962
 2010-08-05 13:32:58 +00:00
Michael Raskin 255a56fbc5 allow wildcard Synaptics configuration 
svn path=/nixos/trunk/; revision=22954
 2010-08-04 20:07:58 +00:00
Eelco Dolstra e3c2a1f49e * Fix the dump feature. 
svn path=/nixos/trunk/; revision=22950
 2010-08-04 14:05:14 +00:00
Sander van der Burg 9a94e561a5 The DocumentRoot directory is now automatically created if it does not exists. This will prevent the service from working if a user forgets to create the DocumentRoot directory himself and this also makes automated testing easier. 
svn path=/nixos/trunk/; revision=22929
 2010-08-03 13:48:08 +00:00
Lluís Batlle i Rossell 02bf0db39e Making the X keyboard settings go in xorg.conf, and not in HAL anymore. 
Setting to the synaptics default speeds the speeds I like. I think we were having
defaults still from the time the values meant some different speeds.

The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.


svn path=/nixos/trunk/; revision=22904
 2010-08-02 19:06:42 +00:00
Eelco Dolstra 25fd35862a * Add /nix/var/nix/profiles/default and config.system.path to the list 
of DBus configuration directories.  Thus packages with DBus
  configuration files installed in the default profile will be found
  automatically.  (It would be nice to include $HOME/.nix-profile in
  the session bus search path, but I don't think that's possible.)

svn path=/nixos/trunk/; revision=22737
 2010-07-26 14:10:04 +00:00
Eelco Dolstra c52cbca24d * Set $TZ in the X server job (mostly so that the kdm clock shows the 
right time).

svn path=/nixos/trunk/; revision=22728
 2010-07-25 09:52:20 +00:00
Evgeny Egorochkin 2e9851cec2 Fix udev startup issue in OpenVZ guest environment 
svn path=/nixos/trunk/; revision=22725
 2010-07-24 22:05:27 +00:00
Eelco Dolstra 82be7d8d65 * `pam_console' maintains the set of locally logged in users in 
/var/run/console.  This is obsolete, but D-Bus still uses it for its
  `at_console' feature.  So maintain it using a ConsoleKit session
  script.  Borrowed from
  http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/pam-foreground-compat.ck

svn path=/nixos/trunk/; revision=22720
 2010-07-23 14:23:08 +00:00
Eelco Dolstra 21e62884e7 * switch-to-configuration.sh: Signal dbus to reload its configuration. 
svn path=/nixos/trunk/; revision=22718
 2010-07-23 10:52:51 +00:00
Evgeny Egorochkin 88a400f578 Fix LVM failing test due to /proc/devices not being available in some of OpenVZ containers 
svn path=/nixos/trunk/; revision=22717
 2010-07-22 22:45:24 +00:00
Eelco Dolstra d659488209 * Use the regular GRUB menu builder for Amazon. There are two issues: 
we want to generate the GRUB menu without actually installing GRUB
  (because Amazon supplies its own pv-grub), and each menu entry
  requires "root (hd0)".  For the first, allow boot.loader.grub.device
  to be set to "nodev" to indicate that the GRUB menu should be
  generated without installing GRUB.  For the second, add an option
  boot.loader.grub.extraPerEntryConfig to allow commands to be added
  to each GRUB menu entry (in this case, "root (hd0)").

svn path=/nixos/trunk/; revision=22712
 2010-07-22 14:40:29 +00:00
Eelco Dolstra e7c0c929ed * Work around a bug in QEMU, which doesn't implement the "READ DISC 
INFORMATION" SCSI command:

    https://bugzilla.redhat.com/show_bug.cgi?id=609049

  As a result, `cdrom_id' doesn't print
  ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
  /dev/disk/by-label symlinks from being created.  We need these in
  the NixOS installation CD, so use ID_CDROM_MEDIA in the
  corresponding udev rules for now.  This was the behaviour in udev <=
  154.  See also
       
    http://www.spinics.net/lists/hotplug/msg03935.html

svn path=/nixos/trunk/; revision=22691
 2010-07-21 21:15:54 +00:00
Eelco Dolstra d7f638da0c * Amazon now supports booting a custom kernel in the AMI using 
pv-grub, so supply a GRUB menu that starts our own kernel and
  initrd.

svn path=/nixos/trunk/; revision=22678
 2010-07-20 13:53:14 +00:00
Eelco Dolstra 1b04d3a813 * Absolutise $systemConfig in case it's a symlink. 
svn path=/nixos/trunk/; revision=22677
 2010-07-20 13:50:10 +00:00
Eelco Dolstra 63962dd7d6 * Disable the test to see whether $stage2Init exists. For some 
unfathomable reason this test fails on EC2 if it's a symlink
  (despite the -L test).  I give up.

svn path=/nixos/trunk/; revision=22676
 2010-07-20 13:49:04 +00:00
Eelco Dolstra 1a5c18d1b6 svn path=/nixos/trunk/; revision=22647 2010-07-18 22:29:40 +00:00
Eelco Dolstra b14f80c89a * The modprobe wrapper nowadays checks whether the version of the 
current kernel module tree matches the booted kernel, so it should
  be safe to use after an upgrade.

svn path=/nixos/trunk/; revision=22627
 2010-07-18 20:19:27 +00:00
Eelco Dolstra b835f7f0dd * Fix PostgreSQL boot. 
svn path=/nixos/trunk/; revision=22615
 2010-07-15 21:21:16 +00:00
Eelco Dolstra f3e1607758 * Don't run the emergency-shell task after nixos-rebuild because it 
screws up the X server (CPU usage goes to 100%, switching virtual
  consoles no longer works, etc.).  TODO: we need some generic way to
  mark jobs that shouldn't be started automatically.

svn path=/nixos/trunk/; revision=22608
 2010-07-15 12:31:18 +00:00
Eelco Dolstra b614179eed * Install a configuration.nix in the AMI. 
svn path=/nixos/trunk/; revision=22607
 2010-07-15 11:09:30 +00:00
Eelco Dolstra f1dde44ac1 * Added an action `nixos-rebuild pull' to just pull the Nixpkgs 
channel manifest and exit.  Useful if you don't want to use
  nix-channel.

svn path=/nixos/trunk/; revision=22601
 2010-07-14 14:18:27 +00:00
Eelco Dolstra f0b647c326 * Allow the Apache submodules to declare whether they need PHP. 
Don't depend on PHP unless this is the case.

svn path=/nixos/trunk/; revision=22600
 2010-07-14 12:58:38 +00:00
Eelco Dolstra bfe46a653b * Mount /dev, /proc and /sys when booting without a stage 1 (e.g. on 
Amazon).

svn path=/nixos/trunk/; revision=22598
 2010-07-14 10:55:45 +00:00
Eelco Dolstra fb97b5b122 * MediaWiki 1.15.4. 
svn path=/nixos/trunk/; revision=22589
 2010-07-13 21:11:35 +00:00
Eelco Dolstra 4b018d1294 svn path=/nixos/trunk/; revision=22587 2010-07-13 20:47:31 +00:00
Wouter den Breejen e058f7ea45 sabnzbd now really starts at boot 
svn path=/nixos/trunk/; revision=22579
 2010-07-13 14:45:44 +00:00
Eelco Dolstra baf54c517d * Fix the terminal_output command. (This used to work but not with 
the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
 2010-07-13 11:48:40 +00:00
Eelco Dolstra 2b7ac80b3d * Style changes. 
svn path=/nixos/trunk/; revision=22573
 2010-07-13 09:23:35 +00:00
Eelco Dolstra 44656be396 * dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than 
${configDir}/system.conf.  This is necessary to enable dbus to
  reload its configuration on SIGHUP after a nixos-rebuild.  (The
  daemon cannot be restarted because then console-kit-daemon loses its
  state.)
* Generate a proper /etc/dbus-1/session.conf.

svn path=/nixos/trunk/; revision=22572
 2010-07-13 09:22:52 +00:00