Rev 622: nicer use of testparm in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 622
revision-id: tridge at samba.org-20070913232434-9fhk40ayfeqa3316
parent: tridge at samba.org-20070913043623-p9j44tz2hl17vx7u
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.test2
timestamp: Fri 2007-09-14 09:24:34 +1000
message:
  nicer use of testparm
modified:
  config/events.d/50.samba       samba-20070601105340-vlcvnp6euoj3zdwy-3
=== modified file 'config/events.d/50.samba'
--- a/config/events.d/50.samba	2007-09-13 04:36:23 +0000
+++ b/config/events.d/50.samba	2007-09-13 23:24:34 +0000
@@ -50,7 +50,7 @@
 	nice service smb start
 
 	# wait for the Samba tcp ports to become available
-	smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d= -f2`
+	smb_ports=`testparm -s --parameter-name="smb ports" 2> /dev/null`
 	ctdb_wait_tcp_ports "Samba" $smb_ports
 
 	# wait for winbind to be ready
@@ -96,7 +96,7 @@
 	smb_dirs=`testparm -s 2> /dev/null | egrep '^\s*path = '  | cut -d= -f2`
 	ctdb_check_directories "Samba" $smb_dirs	
 
-	smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d= -f2`
+	smb_ports=`testparm -s --parameter-name="smb ports" 2> /dev/null`
 	ctdb_check_tcp_ports "Samba" $smb_ports
 
 	# check winbind is OK