summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-12 13:33:47 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-12 13:33:47 +0000
commit2a549efe0a9fddecad1903f81a4742abd5149e45 (patch)
tree43c9e5d1fb9bac6b976a7b9fbfcf75c2a506f63c
parentf7dbcd9d78e7964f55f59d8d19ead9671fd0b068 (diff)
downloaddrakx-2a549efe0a9fddecad1903f81a4742abd5149e45.tar
drakx-2a549efe0a9fddecad1903f81a4742abd5149e45.tar.gz
drakx-2a549efe0a9fddecad1903f81a4742abd5149e45.tar.bz2
drakx-2a549efe0a9fddecad1903f81a4742abd5149e45.tar.xz
drakx-2a549efe0a9fddecad1903f81a4742abd5149e45.zip
errm, don't commit crappy gnome proxy handling for now
-rw-r--r--perl-install/network/network.pm34
1 files changed, 0 insertions, 34 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 7a03fc028..ac3f3f64d 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -322,40 +322,6 @@ sub proxy_configure {
chmod 0755, "$::prefix/etc/profile.d/proxy.sh";
setExportedVarsInCsh("$::prefix/etc/profile.d/proxy.csh", $u, qw(http_proxy ftp_proxy));
chmod 0755, "$::prefix/etc/profile.d/proxy.csh";
-
- #- Gnome proxy settings
- if (-d "$::prefix/etc/gconf/2/") {
- my $defaults_dir = "/etc/gconf/2/local-defaults.path";
- my $p_defaults_dir = "$::prefix$defaults_dir";
- my $p_defaults_path = "$::prefix/etc/gconf/gconf.xml.local-defaults";
- -d $p_defaults_dir or mkdir $p_defaults_dir, 0755;
- -r $p_defaults_path or output_with_perm($p_defaults_path, 0755, qq(
-# System local settings
-xml:readonly:$defaults_dir
-));
- my $gconf_cmd = $::prefix . "gconftool --config-source='xml::$p_defaults_dir' --direct ";
-
- #- http proxy
- if (my ($user, $password, $host, $port) = $u->{http_proxy} =~ m,^http://(?:([^:\@]+)(?::([^:\@]+))?\@)?([^\:]+)(?::(\d+))?$,) {
- $port ||= 80;
- system($gconf_cmd . "--set --type=bool /system/http_proxy/use_http_proxy true");
- system($gconf_cmd . "--set --type=string /system/http_proxy/host '$host'");
- system($gconf_cmd . "--set --type=int /system/http_proxy/port '$port'");
- system($gconf_cmd . "--set --type=bool /system/http_proxy/use_authentication " . ($user ? "true" : "false"));
- $user and system($gconf_cmd . "--set --type=string /system/http_proxy/authentication_user '$user'");
- $password and system($gconf_cmd . "--set --type=string /system/http_proxy/authentication_password '$password'");
- }
- #- ftp proxy
- if (my ($host, $port) = $u->{ftp_proxy} =~ m,^ftp://(?:[^:\@]+(?::[^:\@]+)?\@)?([^\:]+)(?::(\d+))?$,) {
- $port ||= 21;
- system($gconf_cmd . "--set --type=string /system/proxy/mode manual");
- system($gconf_cmd . "--set --type=string /system/proxy/ftp_host '$host'");
- system($gconf_cmd . "--set --type=int /system/proxy/ftp_port '$port'");
- }
- # FIXME: add https support, when should /system/proxy/mode be set ?
- #- make gconf daemons reload their settings
- system("killall -s HUP gconfd-2");
- }
}
sub read_all_conf {