diff options
| author | Stew Benedict <stewb@mandriva.org> | 2004-04-06 21:11:13 +0000 |
|---|---|---|
| committer | Stew Benedict <stewb@mandriva.org> | 2004-04-06 21:11:13 +0000 |
| commit | f6c388d98aa3daab3965525dee84ce0ab0017987 (patch) | |
| tree | 13a4f5dce4c7ecd5f3db44a0c3c104ebab83a219 /perl-install | |
| parent | d2de6b2eeeae90d8f6d416997713286ae888bb60 (diff) | |
| download | drakx-f6c388d98aa3daab3965525dee84ce0ab0017987.tar drakx-f6c388d98aa3daab3965525dee84ce0ab0017987.tar.gz drakx-f6c388d98aa3daab3965525dee84ce0ab0017987.tar.bz2 drakx-f6c388d98aa3daab3965525dee84ce0ab0017987.tar.xz drakx-f6c388d98aa3daab3965525dee84ce0ab0017987.zip | |
Use a scalar with cat_ (Pixel suggestion).
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/drakTermServ | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ index 935364216..9f3b5bfcc 100755 --- a/perl-install/standalone/drakTermServ +++ b/perl-install/standalone/drakTermServ @@ -1264,8 +1264,8 @@ sub dhcpd_config() { $entry_name_server2->set_text($nservers[2]); $entry_name_server3->set_text($nservers[3]); - my @dhcpd = cat_("/etc/dhcpd.conf"); - if (-e "/etc/dhcpd.conf" && @dhcpd[0] !~ /drakTermServ/) { + my $dhcpd_conf = cat_("/etc/dhcpd.conf"); + if (-e "/etc/dhcpd.conf" && $dhcpd_conf !~ /drakTermServ/) { $button_msg = N("Append TS Includes To Existing Config"); } else { $button_msg = N("Write Config"); @@ -1317,7 +1317,7 @@ sub dhcpd_config() { $entry_ip_range_start->get_text, $entry_ip_range_end->get_text) } else { - write_dhcpd_config("append", @nothing) unless any { /dhcpd.conf.terminal-server/ } @dhcpd; + write_dhcpd_config("append", @nothing) if $dhcpd_conf !~ /dhcpd.conf.terminal-server/; } } ), @@ -1479,10 +1479,10 @@ sub enable_ts { @buff = (); $buff[0] = "Enabling Terminal Server...\n\n"; $buff[1] = "\tChecking default /etc/dhcpd.conf...\n"; - my @my_conf = cat_("/etc/dhcpd.conf"); - if ($my_conf[0] !~ /drakTermServ/) { + my $dhcpd_conf = cat_("/etc/dhcpd.conf"); + if ($dhcpd_conf !~ /drakTermServ/) { if (-e "/etc/dhcpd.conf") { - write_dhcpd_config("append", @nothing) if ! any { /dhcpd.conf.terminal-server/ } @my_conf; + write_dhcpd_config("append", @nothing) if $dhcpd_conf !~ /dhcpd.conf.terminal-server/; } else { if ($cmd_line == 1) { print("No /etc/dhcpd.conf built yet - use GUI to create!!\n"); |