summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2004-06-01 15:40:47 +0000
committerStew Benedict <stewb@mandriva.org>2004-06-01 15:40:47 +0000
commit1f6abba6caeaa38437aaafca9eae85cc79de01f3 (patch)
tree30840af8d1352d43a008b34a7ef7a59ae96d0b4b /perl-install
parentec4c70b1ac6cd7b0cb39f7619df2a61ecc90b617 (diff)
downloaddrakx-1f6abba6caeaa38437aaafca9eae85cc79de01f3.tar
drakx-1f6abba6caeaa38437aaafca9eae85cc79de01f3.tar.gz
drakx-1f6abba6caeaa38437aaafca9eae85cc79de01f3.tar.bz2
drakx-1f6abba6caeaa38437aaafca9eae85cc79de01f3.tar.xz
drakx-1f6abba6caeaa38437aaafca9eae85cc79de01f3.zip
Use array rather than hash per Thierry.
Insure ftp transfers are binary, fix gui problem (in 10.0 update also).
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakTermServ4
-rwxr-xr-xperl-install/standalone/drakbackup2
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 80f0bce1d..78031be88 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -1945,8 +1945,8 @@ sub create_client_sysnetwork {
my ($hostname, $ip) = @_;
log::explanations("Adding /etc/sysconfig/network for $ip");
my $network_file = "/etc/sysconfig/network\$\$IP=$ip\$\$";
- my %net_data = ("HOSTNAME=$hostname\n", "NETWORKING=yes\n", "FORWARD_IPV4=false\n");
- output_p($network_file, %net_data);
+ my @net_data = ("HOSTNAME=$hostname\n", "NETWORKING=yes\n", "FORWARD_IPV4=false\n");
+ output_p($network_file, @net_data);
}
sub restart_server() {
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 1eb1e3cca..eff57c764 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -544,6 +544,7 @@ sub ftp_client() {
$ftp = 0;
}
return 1 if !$ftp;
+ $ftp->binary();
$ftp->cwd($conf{HOST_PATH});
foreach (@file_list_to_send_by_ftp) {
$interactive and $pbar->set_fraction(0);
@@ -3605,6 +3606,7 @@ sub restore_ftp {
else { $ftp = Net::FTP->new($hostname, Debug => 0) or return 1 }
$ftp->login($username, $userpass);
$ftp->cwd($hostpath);
+ $ftp->binary();
my $wild_card = catalog_to_wildcard($cat_entry);