From 1bbea20509cf35096894c60cd4050b3b9f44836d Mon Sep 17 00:00:00 2001 From: stanley lieber Date: Sun, 15 May 2011 04:07:06 +0000 Subject: [PATCH] pkg: add pkg/local, $PKG_PATH --- .hgignore | 19 ++++++++++---- adm/keys.who | 3 +++ adm/timezone/local | 2 +- cfg/plan9.ini | 7 ++++++ lib/ndb/local | 55 ++++++++++++++++++++++++++++++++--------- sys/lib/tls/mail | 2 +- sys/log/cron | 13 ++++++++++ sys/src/cmd/pkg/install | 5 +++- sys/src/cmd/pkg/list | 5 +++- sys/src/cmd/pkg/local | 3 +++ 10 files changed, 93 insertions(+), 21 deletions(-) create mode 100755 sys/src/cmd/pkg/local diff --git a/.hgignore b/.hgignore index a8974305d..10a613e7b 100644 --- a/.hgignore +++ b/.hgignore @@ -1,10 +1,19 @@ syntax: regexp -^sys/src/.*\.[ao]?[12578vqki]?$ -^sys/src/(.*/)?[12578vqki]\..*$ -^sys/lib/python/.*\.(pyo|pyc|exe)$ -^(dev|fd|net|srv|env|root|boot|mnt|n|bin|tmp)/ ^(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/(bin|lib)/ ^386/(9(pc|boot).*|pbs|mbr|init) ^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/ +^adm/(keys.who|timezone\/local) +^cfg/plan9.ini +^(dev|fd|net|srv|env|root|boot|mnt|n|bin|tmp)/ +^dist/replica/ +^lib/font/bit/vera.* +^lib/ndb/local +^mail/box/ +^n/sources/ +^sys/lib/(linux|texmf)/ +^sys/lib/python/.*\.(pyo|pyc|exe)$ +^sys/lib/tls/mail +^sys/log/ +^sys/src/.*\.[ao]?[12578vqki]?$ +^sys/src/(.*/)?[12578vqki]\..*$ ^usr/ -^sys/lib/pkg \ No newline at end of file diff --git a/adm/keys.who b/adm/keys.who index e69de29bb..c9433f481 100644 --- a/adm/keys.who +++ b/adm/keys.who @@ -0,0 +1,3 @@ +bootes||||bootes +sl||||sl +bootes||||bootes diff --git a/adm/timezone/local b/adm/timezone/local index 000547121..bf8ae4c11 100755 --- a/adm/timezone/local +++ b/adm/timezone/local @@ -1,4 +1,4 @@ -EST -18000 EDT -14400 +CST -21600 CDT -18000 9943200 25664400 41392800 57718800 73447200 89168400 104896800 120618000 126669600 152067600 162352800 183517200 199245600 215571600 230695200 247021200 262749600 278470800 diff --git a/cfg/plan9.ini b/cfg/plan9.ini index e69de29bb..aab8c4883 100644 --- a/cfg/plan9.ini +++ b/cfg/plan9.ini @@ -0,0 +1,7 @@ +# config for initial cd booting +*nomp=1 +cdboot=yes +mouseport=ask +monitor=ask +vgasize=ask +bootfile=/386/9pcf diff --git a/lib/ndb/local b/lib/ndb/local index 11a0ab9f5..db87d0563 100755 --- a/lib/ndb/local +++ b/lib/ndb/local @@ -8,22 +8,53 @@ database= auth=sources.cs.bell-labs.com authdom=outside.plan9.bell-labs.com -#auth=cirno.9front authdom=9front +auth=hr99.actron authdom=actron -#ntp=pool.ntp.org +auth=l299.onoff authdom=onoff + +auth=cb.inri authdom=inri + +auth=sp.inri.net authdom=inri.net + +ntp=64.90.182.55 # # because the public demands the name localsource # ip=127.0.0.1 sys=localhost dom=localhost -# example: adjust to fit your network -#ipnet=9front ip=192.168.0.0 ipmask=255.255.255.0 -# auth=cirno.9front -# cpu=cirno.9front -# dns=192.168.0.2 -# dnsdom=9front -# smtp=cirno.9front -# -#ip=192.168.0.1 sys=gw dom=gw.9front -#ip=192.168.0.2 sys=cirno dom=cirno.9front +ipnet=onoff ip=192.168.77.0 ipmask=255.255.255.0 + auth=l299.onoff + cpu=l299.onoff + dns=8.8.8.8 + dnsdom=onoff + smtp=phoenix + +ip=192.168.77.52 sys=l299 dom=l299.onoff +ip=192.168.77.57 sys=holon99 dom=holon99.onoff +ip=192.168.77.63 sys=rg99 dom=rg99.onoff +ip=192.168.77.92 sys=pham99 dom=pham99.onoff + +ip=192.168.4.2 sys=onoff dom=onoff.inri +ip=192.168.4.9 sys=frontier dom=frontier.inri +ip=192.168.4.52 sys=l2 dom=l2.inri +ip=192.168.4.56 sys=ipad dom=ipad.inri +ip=192.168.4.57 sys=holon dom=holon.inri +ip=192.168.4.58 sys=sdf1 dom=sdf1.inri +ip=192.168.4.63 sys=rg dom=rg.inri +ip=192.168.4.80 sys=hr dom=hr.inri +ip=192.168.4.86 sys=vf1s dom=vf1s.inri +ip=192.168.4.90 sys=cb dom=cb.inri +ip=192.168.4.92 sys=pham dom=pham.inri + +ip=174.136.104.193 sys=gw dom=gw.inri.net +ip=174.136.104.194 sys=phoenix dom=phoenix.inri.net +ip=174.136.104.195 sys=lain dom=lain.inri.net +ip=174.136.104.196 sys=sp dom=sp.inri.net + +ip=192.168.77.80 sys=hr99 dom=hr99.actron + +ip=192.168.6.129 sys=re9714 dom=re9714.att + + + diff --git a/sys/lib/tls/mail b/sys/lib/tls/mail index bf646337e..b0ac52605 100644 --- a/sys/lib/tls/mail +++ b/sys/lib/tls/mail @@ -1 +1 @@ -x509 sha1=1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e (replace with your mail server fingerprint) +x509 sha1=C969B712918818ED839D98B781411F9BE51C0571 diff --git a/sys/log/cron b/sys/log/cron index e69de29bb..96d7c387e 100644 --- a/sys/log/cron +++ b/sys/log/cron @@ -0,0 +1,13 @@ +cirno May 10 21:55:36 time advanced more than a day +l2 May 10 21:07:08 time advanced more than a day +l2 May 10 22:25:54 time advanced more than a day +l2 May 11 19:21:35 time advanced more than a day +l2 May 11 19:51:18 time advanced more than a day +l2 May 11 22:00:33 time advanced more than a day +l2 May 11 22:48:49 time advanced more than a day +l2 May 14 00:56:57 time advanced more than a day +l2 May 14 15:47:10 time advanced more than a day +l2 May 14 20:01:51 time advanced more than a day +l2 May 14 20:45:26 time advanced more than a day +l2 May 14 21:48:51 time advanced more than a day +l2 May 14 21:59:07 time advanced more than a day diff --git a/sys/src/cmd/pkg/install b/sys/src/cmd/pkg/install index 7bc228c8f..7c1baf223 100755 --- a/sys/src/cmd/pkg/install +++ b/sys/src/cmd/pkg/install @@ -1,5 +1,8 @@ #!/bin/rc -e +if(~ $#PKG_PATH 0) + PKG_PATH=http://pkg.violetti.org + cd / mkdir -p /sys/lib/pkg if (test -s /sys/lib/pkg/$1) { @@ -7,6 +10,6 @@ if (test -s /sys/lib/pkg/$1) { exit } echo Installing $1 -hget http://pkg.violetti.org/$cputype/$1.tbz | bunzip2 | pkg/unpkg>[2]/sys/lib/pkg/$1 +hget $PKG_PATH/$cputype/$1.tbz | bunzip2 | pkg/unpkg>[2]/sys/lib/pkg/$1 echo Done diff --git a/sys/src/cmd/pkg/list b/sys/src/cmd/pkg/list index 419e47a52..9a38d7fa3 100755 --- a/sys/src/cmd/pkg/list +++ b/sys/src/cmd/pkg/list @@ -1,3 +1,6 @@ #!/bin/rc -hget http://pkg.violetti.org/$cputype | htmlfmt | grep '\.tbz' | sed -e 's/\.tbz$//' +if(~ $#PKG_PATH 0) + PKG_PATH=http://pkg.violetti.org + +hget $PKG_PATH/$cputype | htmlfmt | grep '\.tbz' | sed -e 's/\.tbz$//' diff --git a/sys/src/cmd/pkg/local b/sys/src/cmd/pkg/local new file mode 100755 index 000000000..31d91c477 --- /dev/null +++ b/sys/src/cmd/pkg/local @@ -0,0 +1,3 @@ +#!/bin/rc + +ls -p /sys/lib/pkg