diff options
| author | matteo <matteo.pasotti@gmail.com> | 2014-07-05 15:12:23 +0300 |
|---|---|---|
| committer | matteo <matteo.pasotti@gmail.com> | 2014-07-05 15:12:23 +0300 |
| commit | 96a6b704886f54314ac4eaf48f5d898ab8f93fb9 (patch) | |
| tree | 6f3a7b5934636dd440b8268b108a2d481961208b /lib/AdminPanel/Shared/Services.pm | |
| parent | 5777daf56328caf38f2c8aae8731e76917ea4d77 (diff) | |
| parent | 8bce3d19325a0108e0b801017d48957e0a93080d (diff) | |
| download | manatools-96a6b704886f54314ac4eaf48f5d898ab8f93fb9.tar manatools-96a6b704886f54314ac4eaf48f5d898ab8f93fb9.tar.gz manatools-96a6b704886f54314ac4eaf48f5d898ab8f93fb9.tar.bz2 manatools-96a6b704886f54314ac4eaf48f5d898ab8f93fb9.tar.xz manatools-96a6b704886f54314ac4eaf48f5d898ab8f93fb9.zip | |
Merge branch 'master' of ssh://git.mageia.org/software/adminpanel
Diffstat (limited to 'lib/AdminPanel/Shared/Services.pm')
| -rw-r--r-- | lib/AdminPanel/Shared/Services.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/AdminPanel/Shared/Services.pm b/lib/AdminPanel/Shared/Services.pm index c6de77aa..1870e046 100644 --- a/lib/AdminPanel/Shared/Services.pm +++ b/lib/AdminPanel/Shared/Services.pm @@ -84,12 +84,12 @@ use diagnostics; use Sys::Syslog; use File::Basename qw( basename ); -use AdminPanel::Shared qw(member); use AdminPanel::Shared::Locales; use lib qw(/usr/lib/libDrakX); use MDK::Common::Func qw(find); use MDK::Common::File qw(cat_); +use MDK::Common::DataStructure qw(member); use run_program qw(rooted); use base qw(Exporter); @@ -292,7 +292,7 @@ sub set_service { my @xinetd_services = map { $_->[0] } xinetd_services(); - if (AdminPanel::Shared::member($service, @xinetd_services)) { + if (MDK::Common::DataStructure::member($service, @xinetd_services)) { $ENV{PATH} = "/usr/bin:/usr/sbin"; run_program::rooted($::prefix, "/usr/sbin/chkconfig", $enable ? "--add" : "--del", $service); } elsif (_running_systemd() || _has_systemd()) { @@ -705,7 +705,7 @@ This function returns if the given service starts at boot sub starts_on_boot { my ($service) = @_; my (undef, $on_services) = services(); - AdminPanel::Shared::member($service, @$on_services); + MDK::Common::DataStructure::member($service, @$on_services); } #============================================================= |