summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2012-08-29 19:06:12 +0200
committercinap_lenrek <cinap_lenrek@gmx.de>2012-08-29 19:06:12 +0200
commite1a0aa42dcd82aee85778d135bd3b9a6bd655167 (patch)
tree286ecc56aeea87629e6d55be799e047a6f1cc61f
parent860d938b20bebc8539fba24444722df9f0457571 (diff)
parent30d016224a5cb3ea32fadf1b4c249aa0f3b6ee41 (diff)
downloadplan9front-e1a0aa42dcd82aee85778d135bd3b9a6bd655167.tar.xz
merge
-rw-r--r--lib/troll2
-rw-r--r--sys/games/lib/fortunes3
-rw-r--r--sys/lib/dist/ndb/common5
-rw-r--r--sys/src/9/port/sysproc.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/lib/troll b/lib/troll
index 0a4e49ae4..476321a8b 100644
--- a/lib/troll
+++ b/lib/troll
@@ -101,3 +101,5 @@ Is Pike an ancient old queen, or am I missing something?
Japan's A-bomb survivors warn against nuclear power.
(#cat-v) aiju → stop being so hostile
The go executable is pretty small. Usually 3M or so.
+I want to understand what the diffrence between things like slackware and plan9
+this bug was introduced with the new parallel dial implementation.
diff --git a/sys/games/lib/fortunes b/sys/games/lib/fortunes
index 476aad9f3..32dda26ca 100644
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -4720,3 +4720,6 @@ so far nothing's gone right today!
Firefox is pretty stable, and it does everything I think I need.
If that isn't progress, I don't know what is.
I'm in prison, so it doesn't matter if it's not C.
+Can Designers And Developers Save Health Care?
+Add-on Memory Leak Fix
+b.root-servers.net should be 'Seal Target Geronimo.epub'
diff --git a/sys/lib/dist/ndb/common b/sys/lib/dist/ndb/common
index 888d340b4..3cf6ad7ab 100644
--- a/sys/lib/dist/ndb/common
+++ b/sys/lib/dist/ndb/common
@@ -6,7 +6,7 @@
# real dns root server ips
#
dom=A.ROOT-SERVERS.NET ip=198.41.0.4
-dom=B.ROOT-SERVERS.NET ip=128.9.0.107
+dom=B.ROOT-SERVERS.NET ip=192.228.79.201 # jan 2004
dom=C.ROOT-SERVERS.NET ip=192.33.4.12
dom=D.ROOT-SERVERS.NET ip=128.8.10.90
dom=E.ROOT-SERVERS.NET ip=192.203.230.10
@@ -14,7 +14,7 @@ dom=F.ROOT-SERVERS.NET ip=192.5.5.241
dom=G.ROOT-SERVERS.NET ip=192.112.36.4
dom=H.ROOT-SERVERS.NET ip=128.63.2.53
dom=I.ROOT-SERVERS.NET ip=192.36.148.17
-dom=J.ROOT-SERVERS.NET ip=198.41.0.10
+dom=J.ROOT-SERVERS.NET ip=192.58.128.30 # nov 2002
dom=K.ROOT-SERVERS.NET ip=193.0.14.129
dom=L.ROOT-SERVERS.NET ip=199.7.83.42 # nov 2007
dom=M.ROOT-SERVERS.NET ip=202.12.27.33
@@ -285,6 +285,7 @@ tcp=wiki port=17035
tcp=vica port=17036
tcp=aan port=17037
+
# testing
tcp=9fsa port=18008
diff --git a/sys/src/9/port/sysproc.c b/sys/src/9/port/sysproc.c
index 5844ff549..2217e6bb5 100644
--- a/sys/src/9/port/sysproc.c
+++ b/sys/src/9/port/sysproc.c
@@ -140,7 +140,7 @@ sysrfork(ulong *arg)
incref(p->pgrp);
}
if(flag & RFNOMNT)
- up->pgrp->noattach = 1;
+ p->pgrp->noattach = 1;
if(flag & RFREND)
p->rgrp = newrgrp();