From: yoe <yoe>
Date: Mon, 17 Mar 2008 10:25:43 +0000 (+0000)
Subject: r327: Remove autoreadonly option. It was an error to make it a config file
X-Git-Url: http://git.alex.org.uk

r327: Remove autoreadonly option. It was an error to make it a config file
option in the first place; the "autoreadonly" flag is set when the
server decides that it cannot write to anything and thus automatically
switches readonly on; setting it from config therefore is silly. Also
remove the documentation of this option.
---

diff --git a/nbd-server.5.sgml b/nbd-server.5.sgml
index 04a7857..47c65ee 100644
--- a/nbd-server.5.sgml
+++ b/nbd-server.5.sgml
@@ -174,23 +174,6 @@ manpage.1: manpage.sgml
 	</listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>autoreadonly</option></term>
-	<listitem>
-	  <para>Optional; boolean.</para>
-	  <para>
-	    If this option is set to true, then
-	    <command>nbd-server</command> will automatically switch to
-	    readonly if it cannot write to the file.
-	  </para>
-	  <para>Does not have a corresponding command-line
-	    argument</para>
-	  <para>TODO: verify whether this option actually works as
-	    documented. I have a feeling I've been terribly
-	    stupid.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
 	<term><option>copyonwrite</option></term>
 	<listitem>
 	  <para>
diff --git a/nbd-server.c b/nbd-server.c
index 315d44e..a1a216d 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -555,7 +555,6 @@ GArray* parse_cfile(gchar* f, GError** e) {
 		{ "readonly",	FALSE,	PARAM_BOOL,	NULL, F_READONLY },
 		{ "multifile",	FALSE,	PARAM_BOOL,	NULL, F_MULTIFILE },
 		{ "copyonwrite", FALSE,	PARAM_BOOL,	NULL, F_COPYONWRITE },
-		{ "autoreadonly", FALSE, PARAM_BOOL,	NULL, F_AUTOREADONLY },
 		{ "sparse_cow",	FALSE,	PARAM_BOOL,	NULL, F_SPARSE },
 		{ "sdp",	FALSE,	PARAM_BOOL,	NULL, F_SDP },
 		{ "listenaddr", FALSE,  PARAM_STRING,   NULL, 0 },