From: Ben Gras Date: Tue, 3 Aug 2010 11:18:18 +0000 (+0000) Subject: mtree: drop /usr/local, add some pkgsrc dirs; /usr/etc/rc: pkgsrc rc.d X-Git-Tag: v3.1.8~113 X-Git-Url: http://zhaoyanbai.com/repos/man.rndc.html?a=commitdiff_plain;h=9ce3961b8e7b53194d25072c193358768e3c9e83;p=minix.git mtree: drop /usr/local, add some pkgsrc dirs; /usr/etc/rc: pkgsrc rc.d --- diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree index 9864cae93..25fdb078e 100644 --- a/etc/mtree/minix.tree +++ b/etc/mtree/minix.tree @@ -16,6 +16,8 @@ 755 root operator /usr/bin 755 root operator /usr/etc 755 root operator /usr/pkg +755 root operator /usr/pkg/etc +755 root operator /usr/pkg/etc/rc.d 755 root operator /home 755 root operator /usr/include 755 root operator /usr/include/arpa @@ -36,29 +38,6 @@ 755 root operator /usr/lib/m2 755 root operator /usr/libexec 755 root operator /usr/sbin -775 root operator /usr/local -775 root operator /usr/local/bin -775 root operator /usr/local/etc -775 root operator /usr/local/etc/rc.d -775 root operator /usr/local/include -775 root operator /usr/local/info -775 root operator /usr/local/lib -775 root operator /usr/local/lib/ack -775 root operator /usr/local/lib/gcc -775 root operator /usr/local/man -775 root operator /usr/local/src -755 root operator /usr/local/man/man1 -755 root operator /usr/local/man/man2 -755 root operator /usr/local/man/man3 -755 root operator /usr/local/man/man4 -755 root operator /usr/local/man/man5 -755 root operator /usr/local/man/man6 -755 root operator /usr/local/man/man7 -755 root operator /usr/local/man/man8 -755 root operator /usr/local/man/man9 -775 root operator /usr/local/packages -775 root operator /usr/local/share -775 root operator /usr/local/src 755 root operator /usr/man 755 root operator /usr/man/man1 755 root operator /usr/man/man1x @@ -88,7 +67,10 @@ 755 root operator /var /var/log -> /usr/log 755 root operator /usr/log +755 root operator /usr/gnu +755 root operator /usr/gnu/lib 755 root operator /usr/var 755 root operator /usr/var/db 755 root operator /usr/var/db/pkg +755 root operator /usr/var/run 755 root operator /var/run diff --git a/etc/usr/rc b/etc/usr/rc index 6c0735ca4..86347a12e 100644 --- a/etc/usr/rc +++ b/etc/usr/rc @@ -189,10 +189,12 @@ stop|down) fi esac -d=/usr/local/etc/rc.d +d= # Let packages run their own scripts +for d in /usr/local/etc/rc.d /usr/pkg/etc/rc.d +do if [ -d "$d" ] -then if cd $d +then ( if cd $d then echo -n "Local packages ($action): " for f in * @@ -204,5 +206,6 @@ then if cd $d done echo " done." fi + ) fi - +done