Author: raskin
Date: Wed Nov 24 06:16:16 2010
New Revision: 24833
URL: https://svn.nixos.org/websvn/nix/?rev=24833&sc=1
Log:
Fix startOn for filesystem
Modified:
configurations/trunk/misc/raskin/backup-notebook.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/raskin.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/backup-notebook.nix
==============================================================================
--- configurations/trunk/misc/raskin/backup-notebook.nix Wed Nov 24
06:13:37 2010 (r24832)
+++ configurations/trunk/misc/raskin/backup-notebook.nix Wed Nov 24
06:16:16 2010 (r24833)
@@ -327,7 +327,7 @@
cleanXserverLock = {
name = "clean-xserver-lock";
description = "Clean X lock files";
- startOn = "filesystems/started";
+ startOn = "filesystem";
script = ''
if ! pgrep X; then
rm /tmp/.X*-lock;
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Wed Nov 24
06:13:37 2010 (r24832)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Wed Nov 24
06:16:16 2010 (r24833)
@@ -174,23 +174,13 @@
};
jobs = {
- cleanXserverLock = {
- name = "clean-xserver-lock";
- description = "Clean X lock files";
- startOn = "filesystems/started";
- script = ''
- if ! pgrep X; then
- rm /tmp/.X*-lock;
- fi
- '';
- respawn = false;
- };
makeUserCgroup = {
name = "make-user-cgroup";
description = "Create cgroup where user can create subgroups";
- startOn = "filesystems/started";
+ startOn = "started filesystem";
script = ''
mkdir -m 0777 /dev/cgroup/cpu/user
+ echo /etc/sudo-scripts/clean-cgroup >
/dev/cgroup/cpu/release_agent
'';
};
networkInterfaces.startOn = "never";
Modified: configurations/trunk/misc/raskin/raskin.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin.nix Wed Nov 24 06:13:37 2010
(r24832)
+++ configurations/trunk/misc/raskin/raskin.nix Wed Nov 24 06:16:16 2010
(r24833)
@@ -326,7 +326,7 @@
cleanXserverLock = {
name = "clean-xserver-lock";
description = "Clean X lock files";
- startOn = "filesystems/started";
+ startOn = "filesystem";
script = ''
if ! pgrep X; then
rm /tmp/.X*-lock;
Modified: configurations/trunk/misc/raskin/services-main.nix
==============================================================================
--- configurations/trunk/misc/raskin/services-main.nix Wed Nov 24 06:13:37
2010 (r24832)
+++ configurations/trunk/misc/raskin/services-main.nix Wed Nov 24 06:16:16
2010 (r24833)
@@ -121,7 +121,7 @@
gvpe = {
enable = true;
- startOn = "network-interfaces/started";
+ startOn = "never";
stopOn = "shutdown";
nodename = "raskin-notebook";
configText = builtins.readFile "/root/nix-sysconfig/gvpe-config";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
