From 58693ad81c09243227828b80c8f51d43d524d005 Mon Sep 17 00:00:00 2001 From: aiju Date: Thu, 21 Jul 2011 10:45:41 +0200 Subject: [PATCH 1/3] fshalt: really scram the local machine --- rc/bin/fshalt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rc/bin/fshalt b/rc/bin/fshalt index 867276c2d..c6bf8c854 100755 --- a/rc/bin/fshalt +++ b/rc/bin/fshalt @@ -3,6 +3,7 @@ # and optionally reboot rfork e reboot=no +scram=no switch ($#*) { case 0 case 1 @@ -14,6 +15,8 @@ case * path=(/bin) builtin cd / +bind -c '#s' /srv +bind '#p' /proc unmount /mnt/consoles >[2]/dev/null kill consolefs | rc # don't compete with /mnt/consoles @@ -33,8 +36,11 @@ for (i in $k){ sleep 2 } -# for scram +# for scram, don't scram other systems bind -b '#P' /dev +if (test -e '#P'/apm) + if (! ~ $reboot yes) + scram=yes # halting (binaries we run can't be on the fs we're halting) ramfs @@ -79,7 +85,8 @@ fn x { echo rebooting... echo reboot >'#c/reboot' } - if not scram + if (~ $scram yes) + scram } x From ccee4677bfc1bad900734b8b04ef82929eb8e210 Mon Sep 17 00:00:00 2001 From: aiju Date: Thu, 21 Jul 2011 10:51:32 +0200 Subject: [PATCH 2/3] auth/debug: default hostowner is glenda --- sys/src/cmd/auth/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/src/cmd/auth/debug.c b/sys/src/cmd/auth/debug.c index 56b5202bf..d7df43f8b 100644 --- a/sys/src/cmd/auth/debug.c +++ b/sys/src/cmd/auth/debug.c @@ -268,7 +268,7 @@ authfutz(char *dom, char *user) /* try ticket request using bootes key */ snprint(prompt, sizeof prompt, "\tcpu server owner for domain %s ", dom); - readcons(prompt, "bootes", 0, tr.authid, sizeof tr.authid); + readcons(prompt, "glenda", 0, tr.authid, sizeof tr.authid); convTR2M(&tr, trbuf); if(_asgetticket(fd, trbuf, tbuf) < 0){ close(fd); From 43f327485d374db949b9d83816c186371bbe4420 Mon Sep 17 00:00:00 2001 From: aiju Date: Thu, 21 Jul 2011 11:58:17 +0200 Subject: [PATCH 3/3] added geode driver to kernel config --- sys/src/9/pc/pccpuf | 6 ++++++ sys/src/9/pc/pcf | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/src/9/pc/pccpuf b/sys/src/9/pc/pccpuf index 3d6f8cadc..6e50e3c9a 100644 --- a/sys/src/9/pc/pccpuf +++ b/sys/src/9/pc/pccpuf @@ -28,6 +28,7 @@ dev vga sd + audio dma floppy dma aoe @@ -71,6 +72,10 @@ link usbohci usbehci usbehcipc + audiosb16 dma + audioac97 audioac97mix + audiohda + misc archmp mp apic mtrr @@ -94,6 +99,7 @@ misc vgact65545 +cur vgacyber938x +cur vgaet4000 +cur + vgageode +cur vgahiqvideo +cur vgai81x +cur vgamach64xx +cur diff --git a/sys/src/9/pc/pcf b/sys/src/9/pc/pcf index 24019ee18..bfebfa2b5 100644 --- a/sys/src/9/pc/pcf +++ b/sys/src/9/pc/pcf @@ -101,6 +101,7 @@ misc vgact65545 +cur vgacyber938x +cur vgaet4000 +cur + vgageode +cur vgahiqvideo +cur vgai81x +cur vgamach64xx +cur