public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename startSSHAgent' to startOpenSSHAgent'.

Browse Source 
svn path=/nixos/trunk/; revision=18515
This commit is contained in:
Ludovic Courtès 2009-11-22 00:40:53 +00:00
parent 8c349a9e71
commit ab3332a2eb
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/rename.nix
View File

@ -71,6 +71,9 @@ in zipModules ([]
++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice" ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage" ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
# X11
++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
# KDE # KDE
++ rename deprecated "kde.extraPackages" to "environment.kdePackages" ++ rename deprecated "kde.extraPackages" to "environment.kdePackages"

2
modules/services/x11/display-managers/default.nix
View File

@ -32,7 +32,7 @@ let
exec > ~/.xsession-errors 2>&1 exec > ~/.xsession-errors 2>&1
''} ''}
${optionalString cfg.startSSHAgent '' ${optionalString cfg.startOpenSSHAgent ''
if test -z "$SSH_AUTH_SOCK"; then if test -z "$SSH_AUTH_SOCK"; then
# Restart this script as a child of the SSH agent. (It is # Restart this script as a child of the SSH agent. (It is
# also possible to start the agent as a child that prints # also possible to start the agent as a child that prints

10
modules/services/x11/xserver.nix
View File

@ -198,10 +198,10 @@ in
''; '';
}; };
startSSHAgent = mkOption { startOpenSSHAgent = mkOption {
default = true; default = true;
description = '' description = ''
Whether to start the SSH agent when you log in. The SSH agent Whether to start the OpenSSH agent when you log in. The OpenSSH agent
remembers private keys for you so that you don't have to type in remembers private keys for you so that you don't have to type in
passphrases every time you make an SSH connection. Use passphrases every time you make an SSH connection. Use
<command>ssh-add</command> to add a key to the agent. <command>ssh-add</command> to add a key to the agent.
@ -340,14 +340,14 @@ in
message = "The X server needs HAL running. Set services.hal.enable to true"; message = "The X server needs HAL running. Set services.hal.enable to true";
} }
{ assertion = if cfg.startSSHAgent { assertion = if cfg.startOpenSSHAgent
then !cfg.startGnuPGAgent then !cfg.startGnuPGAgent
else (if cfg.startGnuPGAgent else (if cfg.startGnuPGAgent
then !cfg.startSSHAgent then !cfg.startOpenSSHAgent
else true); else true);
message = message =
"The OpenSSH agent and GnuPG agent cannot be started both. " "The OpenSSH agent and GnuPG agent cannot be started both. "
"Choose between `startSSHAgent' and `startGnuPGAgent'."; "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
} }
]; ];