movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-25 10:36:36 +03:00
Code Activity

* Updated some more jobs.

Browse source 
svn path=/nixos/branches/upstart-0.6/; revision=18219
This commit is contained in:
Eelco Dolstra 2009-11-06 19:20:09 +00:00
parent 3fcb7c2cb5
commit 676da4d87d
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/module-list.nix
View file

@ -125,7 +125,7 @@
./system/boot/stage-1.nix ./system/boot/stage-1.nix
./system/boot/stage-2.nix ./system/boot/stage-2.nix
./system/etc/etc.nix ./system/etc/etc.nix
./system/upstart-events/ctrl-alt-delete.nix ./system/upstart-events/control-alt-delete.nix
./system/upstart-events/halt.nix ./system/upstart-events/halt.nix
./system/upstart-events/maintenance-shell.nix ./system/upstart-events/maintenance-shell.nix
./system/upstart/upstart.nix ./system/upstart/upstart.nix

6
modules/system/upstart-events/ctrl-alt-delete.nix → modules/system/upstart-events/control-alt-delete.nix
View file

@ -3,10 +3,10 @@
###### implementation ###### implementation
{ {
jobs.ctrl_alt_delete = jobs.control_alt_delete =
{ name = "ctrl-alt-delete"; { name = "control-alt-delete";
startOn = "ctrlaltdel"; startOn = "control-alt-delete";
task = true; task = true;

6
modules/tasks/kbd.nix
View file

@ -59,9 +59,11 @@ in
jobs.kbd = jobs.kbd =
{ description = "Keyboard / console initialisation"; { description = "Keyboard / console initialisation";
startOn = "udev"; startOn = "started udev";
preStart = '' task = true;
script = ''
export LANG=${defaultLocale} export LANG=${defaultLocale}
export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont

2
modules/tasks/lvm.nix
View file

@ -7,7 +7,7 @@
config = { config = {
jobs.lvm = jobs.lvm =
{ startOn = " udev"; # !!! or on new-devices { startOn = "started udev or new-devices";
script = script =
'' ''

4
modules/tasks/swraid.nix
View file

@ -13,7 +13,7 @@ in
{ {
jobs.swraid = jobs.swraid =
{ startOn = "udev"; # !!! or on "new-devices" { startOn = "started udev or new-devices";
script = script =
'' ''
@ -26,6 +26,8 @@ in
# Scan /proc/partitions for RAID devices. # Scan /proc/partitions for RAID devices.
${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf} ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
if ! test -s ${tempConf}; then exit 0; fi
# Activate each device found. # Activate each device found.
${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan