Ubuntu 10.04 support

diff --git a/os_list.txt b/os_list.txt
index 90c6dbf..1b5bb6d 100644 (file)
--- a/os_list.txt
+++ b/os_list.txt
@@ -71,6 +71,7 @@ Ubuntu Linux                  $1      debian-linux    4.0     $etc_issue =~ /Ubuntu.*\sgutsy/i
 Ubuntu Linux                   $1      debian-linux    4.0     $etc_issue =~ /Ubuntu.*\s(7\.[0-9\.]+)\s/i
 Ubuntu Linux                   $1      debian-linux    4.0     $etc_issue =~ /Ubuntu.*\s(8\.[0-9\.]+)\s/i
 Ubuntu Linux                   $1      debian-linux    5.0     $etc_issue =~ /Ubuntu.*\s(9\.[0-9\.]+)\s/i
+Ubuntu Linux                   $1      debian-linux    5.0     $etc_issue =~ /Ubuntu.*\s(10\.[0-9\.]+)\s/i
 Ubuntu Linux                   $1      debian-linux    3.1     $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i
 Mepis Linux                    $1      debian-linux    $1      $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/
 Mepis Linux                    $1      debian-linux    4.0     $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/

diff --git a/samba/config-debian-linux-2.2-* b/samba/config-debian-linux-2.2-*
index a93047e..092429b 100644 (file)
--- a/samba/config-debian-linux-2.2-*
+++ b/samba/config-debian-linux-2.2-*
@@ -9,8 +9,8 @@ smb_conf=/etc/samba/smb.conf
 text_lists=0
 run_from_inetd=0
 sort_mode=0
-start_cmd=/etc/init.d/samba start 
-stop_cmd=/etc/init.d/samba stop 
+start_cmd=/etc/init.d/samba start || /etc/init.d/smbd start
+stop_cmd=/etc/init.d/samba stop || /etc/init.d/smbd stop
 smbgroupedit=/usr/bin/smbgroupedit
 pdbedit=/usr/bin/pdbedit
 net=/usr/bin/net