Selaa lähdekoodia

Don't create a default user config

We don't want to create files in the users home directory unless we
have to. Users can read about how this file works in our man pages.
tags/v1.10.90
Pierre Ossman 5 vuotta sitten
vanhempi
commit
a290ab8e28
1 muutettua tiedostoa jossa 0 lisäystä ja 20 poistoa
  1. 0
    20
      unix/vncserver/vncserver

+ 0
- 20
unix/vncserver/vncserver Näytä tiedosto

@@ -76,17 +76,6 @@ $defaultXStartup
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
"twm\n");

$defaultConfig
= ("## Supported server options to pass to vncserver upon invocation can be listed\n".
"## in this file. See the following manpages for more: vncserver(1) Xvnc(1).\n".
"## Several common ones are shown below. Uncomment and modify to your liking.\n".
"##\n".
"# securitytypes=vncauth,tlsvnc\n".
"# desktop=sandbox\n".
"# geometry=2000x1200\n".
"# localhost\n".
"# alwaysshared\n");

chop($host = `uname -n`);

if (-d "/etc/X11/fontpath.d") {
@@ -320,15 +309,6 @@ if (! $skipxstartup) {
}
}

# Create the user's config file if necessary.
if (!(-e "$vncUserDir/config")) {
warn "Creating default config $vncUserDir/config\n";
open(VNCUSERCONFIG, ">$vncUserDir/config");
print VNCUSERCONFIG $defaultConfig;
close(VNCUSERCONFIG);
chmod 0644, "$vncUserDir/config";
}

# Run the X startup script.
if (! $skipxstartup) {
warn "Starting applications specified in $xstartupFile\n";

Loading…
Peruuta
Tallenna