diff options
Diffstat (limited to 'perl-install/services.pm')
| -rw-r--r-- | perl-install/services.pm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/services.pm b/perl-install/services.pm index 2c6fa1051..581f5fc92 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -62,7 +62,7 @@ This service provides NFS server functionality, which is configured via the nfslock => N_("NFS is a popular protocol for file sharing across TCP/IP networks. This service provides NFS file locking functionality."), numlock => N_("Automatically switch on numlock key locker under console -and XFree at boot."), +and Xorg at boot."), oki4daemon => N_("Support the OKI 4w and compatible winprinters."), pcmcia => N_("PCMCIA support is usually to support things like ethernet and modems in laptops. It won't get started unless configured so it is safe to have @@ -83,12 +83,12 @@ performance metrics for any machine on that network."), rusersd => N_("The rusers protocol allows users on a network to identify who is logged in on other responding machines."), rwhod => N_("The rwho protocol lets remote users get a list of all of the users -logged into a machine running the rwho daemon (similiar to finger)."), +logged into a machine running the rwho daemon (similar to finger)."), sound => N_("Launch the sound system on your machine"), syslog => N_("Syslog is the facility by which many daemons use to log messages to various system log files. It is a good idea to always run syslog."), usb => N_("Load the drivers for your usb devices."), -xfs => N_("Starts the X Font Server (this is mandatory for XFree to run)."), +xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."), ); my ($name) = @_; my $s = $services{$name}; @@ -212,7 +212,7 @@ sub ask_standalone_gtk { }; my $b = Gtk2::EventBox->new; $b->set_events('pointer_motion_mask'); - gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title(N("Services and deamons")), + gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title(N("Services and daemons")), 1, gtkset_size_request(create_scrolled_window(create_packtable({ col_spacings => 10, row_spacings => 3 }, map { my $service = $_; @@ -237,7 +237,9 @@ sub ask_standalone_gtk { gtkpack__(Gtk2::HBox->new(0,0), gtksignal_connect(Gtk2::Button->new(translate($a)), clicked => sub { my $action = $a eq "Start" ? 'restart' : 'stop'; - local $_ = `service $service $action 2>&1`; s/\033\[[^mG]*[mG]//g; + # as we need the output in UTF-8, force it + local $_ = `GP_LANG="UTF-8" service $service $action 2>&1`; s/\033\[[^mG]*[mG]//g; + c::set_tagged_utf8($_); $update_service->($service, $label); $display->($_); })) if !$is_xinetd_service; @@ -341,6 +343,10 @@ sub start_not_running_service ($) { # Exit silently if the service is not installed return 1 if !(-x "$::prefix/etc/rc.d/init.d/$service"); run_program::rooted($::prefix, "/etc/rc.d/init.d/$service", "status"); + if (($? >> 8) != 0) { + run_program::rooted($::prefix, + "/etc/rc.d/init.d/$service", "start"); + } return (($? >> 8) != 0) ? 0 : 1; } |