From 0c24f86ef88df61f17770a60376ab934101e6677 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Sun, 2 Mar 2003 14:12:24 +0000
Subject: use services.pm to restart smb in samba wizard

---
 po/drakwizard.pot                 |  2 +-
 proxy_wizard/scripts/Squidconf.pm | 11 ++++++++---
 samba_wizard/scripts/Smbconf.pm   |  8 +++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index dae7fd8f..fc2a2dd0 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-02 14:28+0100\n"
+"POT-Creation-Date: 2003-03-02 15:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm
index 528d3ab4..0155a72f 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -20,10 +20,12 @@
 
 
 package Squidconf;
+use lib '/usr/lib/libDrakX';
 require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 require "__WIZ_HOME__/common/scripts/Varspaceval.pm";
 require "__WIZ_HOME__/common/scripts/IFCFG.pm";
 use MDK::Common;
+use services;
 use strict;
 use standalone;
 
@@ -83,8 +85,7 @@ level = $ENV{wiz_squid_level}");
 	    s|^\s*\#?\s*(http_access\s*)allow(\s*all.*)|\#$&\n$1deny$2|;
 	    s|^\s*\#?\s*(http_access\s*allow\s*)mynetwork|\#$&\n$1localhost|;
 	} $file;
-    }
-    else { # should not happen
+    } else { # should not happen
 	die "wiz_squid_level error";
     }
     my $t = 0;
@@ -108,7 +109,11 @@ level = $ENV{wiz_squid_level}");
 	append_to_file($file, "cache_peer $ENV{wiz_squid_cachepeer} parent $ENV{wiz_squid_peerport} 3130");
     }
     system("/sbin/chkconfig --level 345 squid on");
-    system("service squid start");
+    if (services::is_service_running('squid')) { 
+        services::restart('squid')
+    } else {
+        services::start('squid')
+    }
     10;
 }
 1;
diff --git a/samba_wizard/scripts/Smbconf.pm b/samba_wizard/scripts/Smbconf.pm
index b44c61e9..253b9c0c 100755
--- a/samba_wizard/scripts/Smbconf.pm
+++ b/samba_wizard/scripts/Smbconf.pm
@@ -19,10 +19,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 package Smbconf;
+use lib '/usr/lib/libDrakX';
 require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 require "__WIZ_HOME__/common/scripts/IFCFG.pm";
 use MDK::Common;
 use strict;
+use services;
 use Data::Dumper;
 
 # All possibilies in the config file must be precedeed by ";" 
@@ -327,7 +329,11 @@ sub	do_it {
 	$conf->comment_menu("printers", ";");
      }
     $conf->write_conf("/etc/samba/smb.conf");
-    system("/etc/rc.d/init.d/smb restart");
+    if (services::is_service_running('smb')) {
+	services::restart('smb') 
+    } else {
+        services::start('smb')
+    }
     10;
 }
 1;
-- 
cgit v1.2.1