hacked libdisk/proto to support skipping file names (.dummy) and setting uid/gid recursively (this solves issue #13). moved cdproto to /sys/lib/sysconfig/proto and added glendas mbox.

3 files changed, 108 insertions, 122 deletions

diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile
index 8d9a130bf..0251c4866 100644
--- a/sys/lib/dist/mkfile
+++ b/sys/lib/dist/mkfile
@@ -1,7 +1,7 @@
 cd:V: /tmp/9front.iso
 	
 
-%.iso: pc/cdproto pc/plan9.ini.cd
+%.iso: pc/plan9.ini.cd
 	bind pc/plan9.ini.cd /n/src9/cfg/plan9.ini
-	disk/mk9660 -9cj -B 386/9bootiso -p pc/cdproto -s /n/src9 -v 'Plan 9 Front' $target
+	disk/mk9660 -9cj -B 386/9bootiso -p /n/src9/sys/lib/sysconfig/proto/cdproto -s /n/src9 -v 'Plan 9 Front' $target
 	unmount /n/src9/cfg/plan9.ini
diff --git a/sys/lib/dist/pc/cdproto b/sys/lib/dist/pc/cdproto
deleted file mode 100644
index 0388a5b18..000000000
--- a/sys/lib/dist/pc/cdproto
+++ /dev/null
@@ -1,120 +0,0 @@
-adm
-	timezone
-		*
-cfg
-	+
-fd
-lib
-	+
-rc
-	+
-mail
-	box
-	faxoutqueue
-	faxqueue
-	fs
-	grey
-	lib
-		*
-	queue
-	tmp
-$cputype
-	+
-acme
-	acid
-		*
-		$cputype
-			*
-	bin
-		*
-		$cputype
-			*
-	mail
-		*
-		$cputype
-			*
-	news
-		*
-	wiki
-		*
-mnt
-	acme
-	apeselect
-	apm
-	cd
-	cons
-		cons
-		consctl
-	consoles
-	doc
-	exportfs
-		*
-	keys
-	lp
-	netkeys
-	news
-	plumb
-	rdb
-	temp
-	term
-	ums
-	vmware
-	web
-	webcookies
-	wiki
-	wrap
-	wsys
-n
-sys
-	games
-		+
-	include
-		+
-	lib
-		+
-	log
-		cs	666 sys sys /dev/null
-		dns	666 sys sys /dev/null
-		mail	666 sys sys /dev/null
-		smtp	666 sys sys /dev/null
-		smtpd	666 sys sys /dev/null
-		listen	666 sys sys /dev/null
-		ipboot	666 sys sys /dev/null
-	man
-		fonts
-		1pub
-			*
-		1
-			*
-		2
-			*
-		3
-			*
-		4
-			*
-		5
-			*
-		6
-			*
-		7
-			*
-		8
-			*
-	src
-		+
-tmp
-usr
-	glenda
-		bin
-			386
-				+
-			rc
-				+
-		lib
-			*
-		tmp
-
-LICENSE
-LICENSE.afpl
-LICENSE.gpl
-NOTICE
diff --git a/sys/lib/sysconfig/proto/cdproto b/sys/lib/sysconfig/proto/cdproto
new file mode 100644
index 000000000..0ba42950f
--- /dev/null
+++ b/sys/lib/sysconfig/proto/cdproto
@@ -0,0 +1,106 @@
+skip=.dummy
+uid=sys
+gid=sys
+adm	d775 adm adm
+	uid=adm
+	gid=adm
+	timezone	d775
+		*
+cfg	d775
+	+
+fd	d775
+lib	d775
+	+
+rc	d775
+	+
+mail	d775 upas upas
+	uid=upas
+	gid=upas
+	box	d775
+		glenda	d775 glenda glenda
+			mbox	a662 glenda glenda
+	faxoutqueue	d777
+	faxqueue	d777
+	fs	d555
+	grey	d775
+	lib	d775
+		*
+	queue	d777
+	tmp	d777
+$cputype	d775
+	+
+acme	d775
+	+
+mnt	d775
+	acme	d555
+	apeselect	d555
+	apm	d555
+	cd	d555
+	cons	d555
+		cons	d555
+		consctl	d555
+	consoles	d555
+	doc	d555
+	exportfs	d555
+		*
+	keys	d555
+	lp	d555
+	netkeys	d555
+	news	d555
+	plumb	d555
+	rdb	d555
+	temp	d555
+	term	d555
+	ums	d555
+	vmware	d555
+	web	d555
+	webcookies	d555
+	wiki	d555
+	wrap	d555
+	wsys	d555
+n	d775
+sys	d775
+	games
+		+
+	include
+		+
+	lib
+		+
+	log
+	man
+		fonts
+		1
+			*
+		2
+			*
+		3
+			*
+		4
+			*
+		5
+			*
+		6
+			*
+		7
+			*
+		8
+			*
+	src
+		+
+tmp	d555
+usr	d775
+	glenda	d775 glenda glenda
+		uid=glenda
+		gid=glenda
+		bin d775
+			386 d775
+				+
+			rc d775
+				+
+		lib d775
+			*
+		tmp d775
+LICENSE	444
+LICENSE.afpl	444
+LICENSE.gpl	444
+NOTICE	444