diff options
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakTermServ | 12 | ||||
| -rwxr-xr-x | perl-install/standalone/drakautoinst | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbug | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakgw | 16 | ||||
| -rwxr-xr-x | perl-install/standalone/draksec | 14 | ||||
| -rwxr-xr-x | perl-install/standalone/drakxtv | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
7 files changed, 26 insertions, 26 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ index 6bb553732..fb4e6b225 100755 --- a/perl-install/standalone/drakTermServ +++ b/perl-install/standalone/drakTermServ @@ -862,7 +862,7 @@ sub maintain_clients { `perl -pi -e 's/Enable=false/Enable=true/' /usr/share/config/kdm/kdmrc`; # This file had 2 "Enable=" entries, one for xdmcp and one for debug change_gdm_xdmcp("true"); - standalone::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf"); + log::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf"); # just xdmcp in hosts.allow is enough for xdm & kdm, but gdm doesn't work - x11 doesn't help either update_hosts_allow("enable"); } else { @@ -870,7 +870,7 @@ sub maintain_clients { `perl -pi -e 's/DisplayManager.requestPort:/\! DisplayManager.requestPort:/' /etc/X11/xdm/xdm-config`; `perl -pi -e 's/Enable=true/Enable=false/' /usr/share/config/kdm/kdmrc`; change_gdm_xdmcp("false"); - standalone::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf"); + log::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf"); update_hosts_allow("disable"); } $in->ask_warn('', N("Need to restart the Display Manager for full changes to take effect. \n(service dm restart - at the console)")); @@ -1455,12 +1455,12 @@ sub update_hosts_allow { return; } if (!$has_all) { - standalone::explanations("Modified file /etc/hosts.allow"); + log::explanations("Modified file /etc/hosts.allow"); append_to_file("/etc/hosts.allow", "ALL:\t$subnet\n"); } $has_all = `grep ALL /etc/hosts.deny`; if (!$has_all) { - standalone::explanations("Modified file /etc/hosts.deny"); + log::explanations("Modified file /etc/hosts.deny"); append_to_file("/etc/hosts.deny", "ALL:\tALL\n"); } } @@ -1469,7 +1469,7 @@ sub update_hosts_allow { for (my $i = 0; $i < @allow; $i++) { if ($allow[$i] =~ /^ALL:\t$subnet/) { splice(@allow, $i, 1); - standalone::explanations("Modified file /etc/hosts.allow"); + log::explanations("Modified file /etc/hosts.allow"); output("/etc/hosts.allow", @allow); last; } @@ -1478,7 +1478,7 @@ sub update_hosts_allow { for (my $i = 0; $i < @deny; $i++) { if ($deny[$i] =~ /^ALL:\tALL/) { splice(@deny, $i, 1); - standalone::explanations("Modified file /etc/hosts.deny"); + log::explanations("Modified file /etc/hosts.deny"); output("/etc/hosts.deny", @deny); last; } diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index c227c2842..329a03b5b 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -75,7 +75,7 @@ my $floppy = detect_devices::floppy(); my $dev = devices::make($floppy); $in->ask_okcancel('', N("Insert a blank floppy in drive %s", $floppy), 1) or quit_global($in, 0); { - standalone::explanations(N("Creating auto install floppy")); + log::explanations(N("Creating auto install floppy")); my $w = $in->wait_message('', N("Creating auto install floppy")); commands::dd("if=$imagefile", "of=$dev", "bs=1440", "count=1024"); common::sync(); diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index 5e9c952c1..772450a22 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -178,7 +178,7 @@ sub connect_bugzilla { exec $ENV{BROWSER},$url if exists $ENV{BROWSER}; my @browser = qw(mozilla konqueror galeon); foreach (@browser) { - if (-e "/usr/bin/$_") { standalone::explanations("Contacting $url with $_\n "); exec $_,$url } + if (-e "/usr/bin/$_") { log::explanations("Contacting $url with $_\n "); exec $_,$url } } $in->ask_warn('', N("No browser available! Please install one")); } diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index e84d71fa3..a8236197d 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -63,13 +63,13 @@ pur_gtk_mode() if $::isEmbedded && $in->isa('interactive::gtk'); sub sys { system(@_) == 0 or log::l("[drakgw] Warning, sys failed for $_[0]") } sub outpend { - standalone::explanations("modified file $_[0]"); + log::explanations("modified file $_[0]"); my $f = shift; local *F; open F, ">>$f" or die "outpend in file $f failed: $!\n"; print F foreach @_; } sub start_daemons () { my $cups_used = 0; - standalone::explanations("Starting daemons"); + log::explanations("Starting daemons"); if (-f "/etc/rc.d/init.d/cups") { if (system("/etc/rc.d/init.d/cups status >/dev/null") == 0) { $cups_used = 1; @@ -91,7 +91,7 @@ sub start_daemons () { } sub stop_daemons () { - standalone::explanations("Stopping daemons"); + log::explanations("Stopping daemons"); foreach (qw(dhcpd named)) { system("/etc/rc.d/init.d/$_ status >/dev/null 2>/dev/null") == 0 and sys("/etc/rc.d/init.d/$_ stop"); } @@ -238,7 +238,7 @@ I am about to setup your Local Area Network with that adapter.", $format->($devi ) or goto step_ask_confirm; defined $device or quit_global($in, 0); } -standalone::explanations("Choosing network device: $device"); +log::explanations("Choosing network device: $device"); my $lan_address = "192.168.1.0"; @@ -314,7 +314,7 @@ if (!($lan_address =~ s/\.0$//)) { N("The Local Network did not finish with `.0', bailing out.")); quit_global($in, 0); } -standalone::explanations("Using LAN address <$lan_address>"); +log::explanations("Using LAN address <$lan_address>"); #- test for potential conflict with other networks @@ -339,7 +339,7 @@ $wait_configuring = $in->wait_message(N("Configuring..."), #- setup the /etc/sysconfig/network-script/ script if ($reconf_dhcp_server_intf) { - standalone::explanations("Reconfiguring network parameters of $device"); + log::explanations("Reconfiguring network parameters of $device"); my $network_scripts = "/etc/sysconfig/network-scripts"; my $ifcfg = "$network_scripts/ifcfg-$device"; renamef($ifcfg, "$network_scripts/old.ifcfg-$device"); @@ -390,7 +390,7 @@ substInFile { s/^FORWARD_IPV4.*\n//; $_ .= "FORWARD_IPV4=true\n" if eof } $sysco #- setup the DHCP server if ($reconf_dhcp_server_intf) { - standalone::explanations("Configuring a DHCP server on $lan_address.0"); + log::explanations("Configuring a DHCP server on $lan_address.0"); renamef($dhcpd_conf, "$dhcpd_conf.old"); output($dhcpd_conf, qq(subnet $lan_address.0 netmask $netmask { # default gateway @@ -441,7 +441,7 @@ substInFile { s/^INTERFACES\n//; $_ .= "INTERFACES=\"$device\"\n" if eof } $sysc #- Modify the root location block in /etc/cups/cupsd.conf if (-f $cups_conf) { - standalone::explanations("Updating CUPS configuration accordingly"); + log::explanations("Updating CUPS configuration accordingly"); substInFile { s/^ServerName[^:].*\n//; $_ .= "ServerName $server_ip\n" if eof; diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index ed5b2508e..012c26711 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -208,25 +208,25 @@ my $bok = gtksignal_connect(new Gtk2::Button(N("Ok")), my $secadmin_value = $secadmin_entry->get_text(); my $w; - standalone::explanations("Configuring msec"); + log::explanations("Configuring msec"); if ($seclevel_value ne security::level::get_string()) { $w = wait_msg(N("Please wait, setting security level...")); - standalone::explanations("Setting security level"); + log::explanations("Setting security level"); security::level::set($seclevel_value); remove_wait_msg($w); } $w = wait_msg(N("Please wait, setting security options...")); - standalone::explanations("Setting security administrator option"); + log::explanations("Setting security administrator option"); $msec->config_check('MAIL_WARN', $secadmin_check_value == 1 ? 'yes' : 'no'); if ($secadmin_value ne $msec->get_check_value('MAIL_USER') && $secadmin_check_value) { - standalone::explanations("Setting security administrator contact"); + log::explanations("Setting security administrator contact"); $msec->config_check('MAIL_USER', $secadmin_value); } - standalone::explanations("Setting security periodic checks"); + log::explanations("Setting security periodic checks"); foreach my $key (keys %security_checks_value) { if ($security_checks_value{$key}->entry->get_text() ne $msec->get_check_value($key)) { $msec->config_check($key, $security_checks_value{$key}->entry->get_text()); @@ -234,13 +234,13 @@ my $bok = gtksignal_connect(new Gtk2::Button(N("Ok")), } foreach my $domain (keys %options_values) { - standalone::explanations("Setting msec functions related to $domain"); + log::explanations("Setting msec functions related to $domain"); foreach my $key (keys %{$options_values{$domain}}) { my $opt = $options_values{$domain}{$key}; $msec->config_function($key, $opt =~ /Combo/ ? $opt->entry->get_text() : $opt->get_text()); } } - standalone::explanations("Applying msec changes"); + log::explanations("Applying msec changes"); run_program::rooted($::prefix, "/usr/sbin/msec"); remove_wait_msg($w); diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 2f1c39f4f..29f4e6065 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -41,7 +41,7 @@ sub scan4channels { #{ exec {'consolehelper'} $0, ("urpmi", "xawtv") or die N("consolehelper missing"); # }; if (! -x "/usr/bin/scantv") { -# standalone::explanations("package xawtv isn't installed"); +# log::explanations("package xawtv isn't installed"); $in->ask_warn("XawTV isn't installed!", formatAlaTeX(N("XawTV isn't installed! @@ -120,7 +120,7 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); $in->ask_warn(N("There was an error while scanning for TV channels"), N("XawTV isn't installed!")) } else { - standalone::explanations("created file $home/.xawtv"); + log::explanations("created file $home/.xawtv"); $in->ask_warn(N("Have a nice day!"), N("Now, you can run xawtv (under X Window!) !\n")) unless $use_X; }; diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 6fc2611d1..fb440aebc 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -70,6 +70,6 @@ foreach (@harddrake::data::tree) { } # output new hw config -standalone::explanations "created file $last_boot_config"; +log::explanations "created file $last_boot_config"; store \%config, $last_boot_config; $in->exit(0); |