1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 08:34:50 +00:00
Commit graph

62 commits

Author SHA1 Message Date
Florian Friesdorf eb755d4692 switched all mergeOptionString to pkgs.lib.types.string
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.

For my system the change evaluated to the exactly same.

svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Shea Levy e87764e327 Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixos/trunk/; revision=30764
2011-12-05 17:32:45 +00:00
Shea Levy 72d7401976 udev: Ignore commented lines when populating run_progs.
Patch by mornfall

svn path=/nixos/trunk/; revision=30763
2011-12-05 16:53:58 +00:00
Eelco Dolstra 8eba736da9 * Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
more readable (also in "ps" output).

svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Eelco Dolstra fe566d84ae * Remove references to the "safemode" boot option, which doesn't do
anything.

svn path=/nixos/trunk/; revision=30199
2011-11-03 00:46:29 +00:00
Peter Simons eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra 4a65eb6830 * Create /var/lib/upower, where upowerd keeps historical battery data.
svn path=/nixos/trunk/; revision=29057
2011-09-06 11:18:36 +00:00
Yury G. Kudryashov 5ee15d4986 Fix hal evaluation
svn path=/nixos/trunk/; revision=28842
2011-08-26 17:30:53 +00:00
Yury G. Kudryashov ea4630bf97 Allow RUN+="socket:..." in udev rules
svn path=/nixos/trunk/; revision=28808
2011-08-25 08:06:09 +00:00
Yury G. Kudryashov e5917ea6fc Merge with udev-173
The only conflict was the addition of two different options at the same place.

svn path=/nixos/trunk/; revision=28801
2011-08-24 21:24:39 +00:00
Eelco Dolstra 13a2563d02 * Create /var/lib/udisks because that's where udisks keeps its mtab
file.  Without this, users are not able to unmount their own
  devices (because udisks doesn't remember who mounted them).

svn path=/nixos/trunk/; revision=28730
2011-08-21 21:03:02 +00:00
Eelco Dolstra abb2779840 * The write_cd_rules script in udev needs udev in its $PATH.
svn path=/nixos/trunk/; revision=27970
2011-07-26 21:01:36 +00:00
Eelco Dolstra a1df35a590 * Don't enable HAL by default anymore. It's obsolete. It's still
enabled by modules that need it (KDE < 4.7, Xfce).
* Don't enable the PolicyKit module by default either, it's also
  obsolete (replaced by PolKit).  It's still enabled if HAL is
  enabled.

svn path=/nixos/trunk/; revision=27933
2011-07-25 00:52:59 +00:00
Eelco Dolstra 2e4acbcf8b * Add a NixOS module for upower.
svn path=/nixos/trunk/; revision=27931
2011-07-25 00:45:52 +00:00
Eelco Dolstra 83846d8417 * NixOS module for Udisks.
svn path=/nixos/trunk/; revision=27909
2011-07-23 01:30:36 +00:00
Eelco Dolstra c971f2b1ac * Shut up some udev warnings.
svn path=/nixos/trunk/; revision=27806
2011-07-17 11:01:31 +00:00
Eelco Dolstra 23d7a822f1 * Fix the path to mount in the rule in 50-udev-default.rules that
mounts /sys/fs/fuse/connections.

svn path=/nixos/trunk/; revision=27802
2011-07-16 18:40:08 +00:00
Eelco Dolstra 82f97b5fb2 * Allow modules to add packages to the $PATH seen by programs called
from udev rules.  This is slightly tricky because udev has a
  512-character limit on environment variables, so we create a symlink
  tree to work around this.

svn path=/nixos/trunk/; revision=23822
2010-09-16 15:23:12 +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 87dcdc05fe * Fix example.
svn path=/nixos/trunk/; revision=23035
2010-08-08 13:57:21 +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 abbc2f4f2b * Make acpid depend on syslogd (to prevent it printing startup
messages to the console).

svn path=/nixos/trunk/; revision=22545
2010-07-09 12:35:06 +00:00
Eelco Dolstra 48fdc931a4 * Run udevtrigger in a separate job. This speeds up booting because
it allows the `mountall' task to start mounting filesystems as soon
  as udev is running and devices become available (i.e. it doesn't
  have to wait for all devices).  This means that some jobs should
  depend on "stopped udevtrigger" instead of "started udev".

svn path=/nixos/branches/boot-order/; revision=22167
2010-06-07 12:39:50 +00:00
Eelco Dolstra dc49a0ce3f * Don't use klibc in the initrd. It's simpler (and slightly smaller)
to use the standard (coreutils) tools.
* Use util-linux's `switch_root' to switch over to the target root
  FS.  It automatically moves over the /dev, /proc and /sys from stage
  1, so stage 2 doesn't need to set them up again.

svn path=/nixos/trunk/; revision=22085
2010-06-01 15:53:24 +00:00
Yury G. Kudryashov 12e43068cf More verbose udev log
svn path=/nixos/trunk/; revision=21881
2010-05-19 19:15:49 +00:00
Lluís Batlle i Rossell 7d6db6ac0c Fixing the pcscd job (daemonType)
svn path=/nixos/trunk/; revision=21845
2010-05-18 17:57:03 +00:00
Eelco Dolstra edee370883 * The default action for udevadm trigger' changed from add' to
`change'.  At boot time, however, we want an `add' event to trigger
  certain rules (e.g. LVM and mdadm).

svn path=/nixos/trunk/; revision=21804
2010-05-16 19:02:45 +00:00
Nicolas Pierron 49dcb07bd9 Fix bad substitution of mdadm program name.
svn path=/nixos/trunk/; revision=21799
2010-05-16 16:35:51 +00:00
Eelco Dolstra 8989d7a3d5 * Udev no longer likes the "%k" name in the kqemu rule, so remove it.
svn path=/nixos/trunk/; revision=21794
2010-05-16 09:39:41 +00:00
Yury G. Kudryashov 69697a35bb Add /root/test-firmware to FIRMWARE_DIRS
svn path=/nixos/trunk/; revision=21317
2010-04-26 09:08:05 +00:00
Yury G. Kudryashov be3df19bd5 Don't try to copy /root/test-firmware to /nix/store
svn path=/nixos/trunk/; revision=21316
2010-04-26 09:04:24 +00:00
Yury G. Kudryashov a5718503e5 Change firmware handling
This way should work with both old udev and new one.

svn path=/nixos/trunk/; revision=21308
2010-04-25 18:26:56 +00:00
Andres Löh 289dcec9db Make acpid actions configurable.
svn path=/nixos/trunk/; revision=20986
2010-04-08 15:27:20 +00:00
Lluís Batlle i Rossell d45a3fbdc9 Adding the pcscd daemon (this daemon manages smartcard reader drivers), and offers
a common interface to programs dealing with smartcards (like users of the opensc lib).


svn path=/nixos/trunk/; revision=19360
2010-01-11 21:56:01 +00:00
Eelco Dolstra ee005424bf * Doh, subtle race condition: STARTUP must be cleared after "udevadm
settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
2010-01-10 20:08:35 +00:00
Eelco Dolstra 6f8a3ba7c7 * Create devicemapper/lvm device nodes from udev (using the rules
supplied by the lvm package).  This makes the "lvm" Upstart task
  unnecessary.  Also, we now get /dev/disk/by-{label,uuid} symlinks
  for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
2010-01-07 22:39:35 +00:00
Eelco Dolstra 1affc9168e * Move power management configuration into a separate module from
the acpid service.
* Add a pm-utils hook to allow commands to be executed when the system
  suspends/resumes etc.

svn path=/nixos/branches/upstart-0.6/; revision=18353
2009-11-15 12:48:42 +00:00
Eelco Dolstra 7aecd0ca53 * hal: depend on both dbus and acpid (if enabled).
* dbus: don't signal Upstart, since that seems to make it forget about
  pending events or something.  In any case starting dbus after acpid
  was running wouldn't trigger hal to be started (but the other way
  around did work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
2009-11-07 12:01:12 +00:00
Eelco Dolstra 83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra d545d08461 * In the network-interfaces task, emit an ip-up event if there is a
statically configured interface (i.e. we're not running dhclient).
  Otherwise the ntpd job won't be triggered.
* Use the "-n" flag of "initctl emit" to send the event
  asynchronously.

svn path=/nixos/branches/upstart-0.6/; revision=18227
2009-11-06 21:38:40 +00:00
Eelco Dolstra 903e92bde6 * Use Upstart's "export fork" feature to properly detect when a daemon
is "ready".  This prevents ugly race conditions, e.g. HAL failing to
  start because dbus hasn't finished starting yet.
* Support post-start scripts.  These are executed after the job's main
  process has started but before the job's "started" event is
  emitted.  For instance, the udev job uses this to perform "udevadm
  trigger / settle" to create all devices.  Previously this had to be
  done in the pre-start script, so the daemon had to started in the
  pre-start script as well.

svn path=/nixos/branches/upstart-0.6/; revision=18211
2009-11-06 15:23:16 +00:00
Eelco Dolstra 5d240b99d5 * Work around a bug in HAL (it fails to start if $PATH is too long,
since it uses a 512-byte buffer somewhere).

svn path=/nixos/branches/upstart-0.6/; revision=18198
2009-11-06 11:31:57 +00:00
Eelco Dolstra feeff52285 * Ugly hack to get HAL to start at boot time. Sometimes it fails
without any error message in the log (maybe ConsoleKit related?).

svn path=/nixos/trunk/; revision=17907
2009-10-21 09:41:32 +00:00
Eelco Dolstra e4defbe8bd * Bring back loading of firmware from /root/test-firmware.
svn path=/nixos/trunk/; revision=17797
2009-10-14 09:38:56 +00:00
Sander van der Burg 4eea2539c1 Added udev permissions for virtualbox guest additions
svn path=/nixos/trunk/; revision=17783
2009-10-13 15:05:06 +00:00
Eelco Dolstra eba8f94069 * jobAttrs -> jobs.
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra d982f23f20 * Convert the remaining jobs to jobAttrs style.
svn path=/nixos/trunk/; revision=17764
2009-10-12 17:27:57 +00:00
Eelco Dolstra d142b8a13b * Remove the ACPI actions. There's obsolete now (handled by HAL /
pm-utils / KDE).

svn path=/nixos/trunk/; revision=17495
2009-09-29 09:52:25 +00:00
Eelco Dolstra 373445c410 * Start bluetoothd from udev.
svn path=/nixos/trunk/; revision=17475
2009-09-28 16:37:46 +00:00
Eelco Dolstra 647d9ba3b6 * udev: removed the /var/run/devices-created hack. It's no longer
needed now that we don't use pam_devperm anymore.  When udev is
  restarted, it now asks ConsoleKit to get the active users and sets
  device ACLs accordingly.

svn path=/nixos/trunk/; revision=17474
2009-09-28 16:27:01 +00:00