svn commit: r213050 - stable/8/sbin/hastctl

[Pawel Jakub Dawidek]

Author: pjd
Date: Thu Sep 23 09:05:40 2010
New Revision: 213050
URL: http://svn.freebsd.org/changeset/base/213050

Log:
  MFC r208028,r210628,r210909,r210912,r211397:
  
  r208028:
  
  mdoc: move remaining sections into consistent order
  
  This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections.
  
  Found by:	mdocml lint run
  Reviewed by:	ru
  
  r210628:
  
  Fix typo.
  
  PR:		docs/149033
  Submitted by:	Kolar <hsn at sendmail.cz>
  
  r210909:
  
  Update the arguments to yy_config_parse() to match r210883.
  
  Choose the more conservative option ('yes' to exit on error) to match
  the equivalent code in hastd.
  
  r210912:
  
  Force commit to remind me about MFCing r210909.
  
  r211397:
  
  Fix typos, spelling, formatting and mdoc mistakes found by Nobuyuki while
  translating these manual pages.  Minor corrections by me.
  
  Submitted by:	Nobuyuki Koganemaru <n-kogane at syd.odn.ne.jp>

Modified:
  stable/8/sbin/hastctl/hastctl.8
  stable/8/sbin/hastctl/hastctl.c
Directory Properties:
  stable/8/sbin/hastctl/   (props changed)

Modified: stable/8/sbin/hastctl/hastctl.8
==============================================================================
--- stable/8/sbin/hastctl/hastctl.8	Thu Sep 23 09:02:10 2010	(r213049)
+++ stable/8/sbin/hastctl/hastctl.8	Thu Sep 23 09:05:40 2010	(r213050)
@@ -105,7 +105,7 @@ The default extent size is
 Maximum number of dirty extents to keep dirty all the time.
 Most recently used extents are kept dirty to reduce number of metadata
 updates.
-The default numer of most recently used extents which will be kept
+The default number of most recently used extents which will be kept
 dirty is
 .Va 64 .
 .It Fl m Ar mediasize
@@ -153,6 +153,20 @@ Print debugging information.
 This option can be specified multiple times to raise the verbosity
 level.
 .El
+.Sh FILES
+.Bl -tag -width ".Pa /var/run/hastctl" -compact
+.It Pa /etc/hast.conf
+Configuration file for
+.Nm
+and
+.Xr hastd 8 .
+.It Pa /var/run/hastctl
+Control socket used by
+.Nm
+to communicate with the
+.Xr hastd 8
+daemon.
+.El
 .Sh EXIT STATUS
 Exit status is 0 on success, or one of the values described in
 .Xr sysexits 3
@@ -164,7 +178,7 @@ nodeB# hastctl create shared
 nodeB# hastd
 nodeB# hastctl role secondary shared
 
-nodeB# hastctl create shared
+nodeA# hastctl create shared
 nodeA# hastd
 nodeA# hastctl role primary shared
 nodeA# newfs -U /dev/hast/shared
@@ -185,20 +199,6 @@ nodeB# fsck -t ufs /dev/hast/shared
 nodeB# mount -o noatime /dev/hast/shared /shared
 nodeB# application_start
 .Ed
-.Sh FILES
-.Bl -tag -width ".Pa /var/run/hastctl" -compact
-.It Pa /etc/hast.conf
-Configuration file for
-.Nm
-and
-.Xr hastd 8 .
-.It Pa /var/run/hastctl
-Control socket used by
-.Nm
-to communicate with the
-.Xr hastd 8
-daemon.
-.El
 .Sh SEE ALSO
 .Xr sysexits 3 ,
 .Xr geom 4 ,

Modified: stable/8/sbin/hastctl/hastctl.c
==============================================================================
--- stable/8/sbin/hastctl/hastctl.c	Thu Sep 23 09:02:10 2010	(r213049)
+++ stable/8/sbin/hastctl/hastctl.c	Thu Sep 23 09:05:40 2010	(r213050)
@@ -432,7 +432,7 @@ main(int argc, char *argv[])
 
 	pjdlog_debug_set(debug);
 
-	cfg = yy_config_parse(cfgpath);
+	cfg = yy_config_parse(cfgpath, true);
 	assert(cfg != NULL);
 
 	switch (cmd) {