Browse Source

Plan 9 from Bell Labs 2007-08-13

David du Colombier 16 years ago
parent
commit
5ebfc25f1e
6 changed files with 11 additions and 9 deletions
  1. 1 0
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 1 0
      sys/man/3/fs
  5. 4 3
      sys/man/3/sdaoe
  6. 3 5
      sys/src/9/port/devsd.c

+ 1 - 0
dist/replica/_plan9.db

@@ -15852,3 +15852,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+sys/man/4/fossil - 664 sys sys 1186820346 9592

+ 1 - 1
dist/replica/plan9.db

@@ -7683,7 +7683,7 @@ sys/man/4/execnet - 664 sys sys 1019866708 1069
 sys/man/4/exportfs - 664 sys sys 1145881912 4655
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1185680600 14842
-sys/man/4/fossil - 664 sys sys 1165622806 9590
+sys/man/4/fossil - 664 sys sys 1186820346 9592
 sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1112563349 4410
 sys/man/4/httpfile - 664 sys sys 1128556957 1233

+ 1 - 0
dist/replica/plan9.log

@@ -49939,3 +49939,4 @@
 1186777805 0 c 386/9loaddebug - 775 sys sys 1186776564 435045
 1186777805 1 c 386/9loadlitedebug - 775 sys sys 1186776564 220555
 1186777805 2 c 386/bin/unzip - 775 sys sys 1186776392 91093
+1186893621 0 c sys/man/4/fossil - 664 sys sys 1186820346 9592

+ 1 - 0
sys/man/3/fs

@@ -156,6 +156,7 @@ fsconfig=/dev/fd0disk
 in
 .IR cat (1),
 .IR dd (1),
+.IR sd (3),
 .IR kfs (4),
 .IR fs (8),
 .IR plan9.ini (8),

+ 4 - 3
sys/man/3/sdaoe

@@ -4,7 +4,7 @@ sdaoe \- ATA-over-Ethernet (AoE) storage device interface
 .SH SYNOPSIS
 .nf
 .B bind -a #S /dev
-.BI "echo config switch on spec " l " type aoe/aoe/" shelf\fB.\fPslot " >/dev/sdctl"
+.BI "echo config switch on spec " l " type aoe//dev/aoe/" shelf\fB.\fPslot " >/dev/sdctl"
 
 .BI /dev/sd l 0/ctl
 .BI /dev/sd l 0/raw
@@ -19,13 +19,14 @@ The default first letter for AoE devices is
 .LR e .
 Each
 .B sdaoe
-device must be configured explicitly. To configure target
+device must be configured explicitly.
+To configure target
 .B 42.0
 on
 .BR sde0 :
 .IP
 .EX
-echo config switch on spec e type aoe/aoe/42.0 >/dev/sdctl
+echo config switch on spec e type aoe//dev/aoe/42.0 >/dev/sdctl
 .EE
 .PP
 To turn this device off,

+ 3 - 5
sys/src/9/port/devsd.c

@@ -1634,12 +1634,10 @@ legacytopctl(Cmdbuf *cb)
 		if(j == nelem(options))
 			error(Ebadarg);
 	}
-	if(cd.on < 0)
+	/* this has been rewritten to accomodate sdaoe */
+	if(cd.on < 0 || cd.spec == 0)
 		error(Ebadarg);
-	if(cd.on
-	&& (cd.spec == 0 || cd.cf.nports == 0 || cd.cf.intnum == 0 || cd.cf.type == nil))
-		error(Ebadarg);
-	if(!cd.on && cd.spec == 0)
+	if(cd.on && cd.cf.type == nil)
 		error(Ebadarg);
 	sdconfig(cd.on, cd.spec, &cd.cf);
 }