summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/lib/dist/mkfile2
-rwxr-xr-xsys/lib/rootstub11
-rw-r--r--sys/lib/sysconfig/proto/cdproto42
3 files changed, 39 insertions, 16 deletions
diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile
index 9a2560ff0..49e1d8eaf 100644
--- a/sys/lib/dist/mkfile
+++ b/sys/lib/dist/mkfile
@@ -4,12 +4,12 @@ iso=/tmp/9front.iso
cd:V: $iso
binds:V:
+ test -d /n/src9/.hg && bind /n/src9 /n/src9/dist/plan9front
bind cfg /n/src9/cfg
bind mail/lib /n/src9/mail/lib
bind ndb /n/src9/lib/ndb
bind -a adm/timezone /n/src9/adm/timezone
bind usr /n/src9/usr
- bind /n/src9 /n/src9/dist/plan9front
%.iso: $proto
@{rfork n
diff --git a/sys/lib/rootstub b/sys/lib/rootstub
index 79368395e..3d053f470 100755
--- a/sys/lib/rootstub
+++ b/sys/lib/rootstub
@@ -88,15 +88,13 @@ mkdir -p arm/bin/replica
mkdir -p arm/bin/upas
mkdir -p arm/bin/venti
mkdir -p arm/lib/ape
-mkdir -p cfg
+mkdir -p cfg/pxe
mkdir -p cron
mkdir -p dist/plan9front
-mkdir -p fd
-mkdir -p lib/audio
+mkdir -p lib/audio/icon
mkdir -p lib/firmware
mkdir -p lib/ndb
mkdir -p lib/tftpd
-mkdir -p mail/box
mkdir -p mail/box/glenda
mkdir -p mail/faxoutqueue
mkdir -p mail/faxqueue
@@ -137,8 +135,6 @@ mkdir -p spim/bin/replica
mkdir -p spim/bin/upas
mkdir -p spim/bin/venti
mkdir -p spim/lib/ape
-mkdir -p mnt
-mkdir -p n
mkdir -p power/bin/ape
mkdir -p power/bin/audio
mkdir -p power/bin/auth
@@ -209,9 +205,10 @@ mkdir -p sparc64/lib/ape
mkdir -p sys/lib/dist/usr/glenda/bin/amd64
mkdir -p sys/lib/dist/usr/glenda/bin/386
mkdir -p sys/lib/dist/usr/glenda/tmp
+mkdir -p sys/lib/dist/cfg/pxe
mkdir -p sys/lib/lp/log
mkdir -p sys/lib/lp/tmp
mkdir -p sys/lib/ssl
-mkdir -p sys/log
+mkdir -p sys/log/httpd
mkdir -p tmp
mkdir -p usr
diff --git a/sys/lib/sysconfig/proto/cdproto b/sys/lib/sysconfig/proto/cdproto
index ea68676b6..ee7680fa1 100644
--- a/sys/lib/sysconfig/proto/cdproto
+++ b/sys/lib/sysconfig/proto/cdproto
@@ -8,12 +8,37 @@ adm d775 adm adm
timezone d775
*
cfg d775
- +
+ plan9.ini
+ pxe d775
cron d775
-fd d775
lib d775
- +
+ *
+ audio d775
+ icon d775
+ *
+ cmap d775
+ *
+ dict d775
+ *
+ face d775
+ +
+ firmware d775
+ font d775
+ bit d775
+ +
+ legal d775
+ *
+ map d775
+ README
+ ndb d775
+ *
+ rfc d775
+ grabrfc
+ sky d775
+ *
+ tftpd d775
rc d775
+ skip=\.local$
+
mail d775 upas upas
uid=upas
@@ -303,6 +328,7 @@ acme d775
wiki d775
+
bin d775
+ skip=\.(out|orig|([ao]?[0125678vqki]?))$
*
386 d775
68000 d775
@@ -322,15 +348,14 @@ acme d775
$objtype d775
+
-mnt d775
-n d775
sys d775
games d775
- +
+ lib d775
+ +
include d775
+
lib d775
- skip=\.(pyo|pyc)$
+ skip=\.(pyo|pyc|orig)$
+
log d775
auth a662 sys sys /sys/lib/dist/empty
@@ -361,11 +386,12 @@ sys d775
www a662 sys sys /sys/lib/dist/empty
man d775
+ skip=\.(pdf|ps|orig)$
+
doc d775
+
src d775
- skip=\.(out|([ao]?[012578vqki]?))$
+ skip=\.(out|orig|([ao]?[0125678vqki]?))$
+
tmp d555