ref: 3202d39042623467db4bf51cb583e191f3aa54d2
parent: 474bc6a14ae55f5b4def8dad3370d9f0a81a7d7e
parent: 43f327485d374db949b9d83816c186371bbe4420
author: cinap_lenrek <cinap_lenrek@localhost>
date: Thu Jul 21 11:59:54 EDT 2011
merge
--- 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 @@
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 @@
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 @@
echo rebooting...
echo reboot >'#c/reboot'
}
- if not scram
+ if (~ $scram yes)
+ scram
}
x
--- a/sys/src/9/pc/pccpuf
+++ b/sys/src/9/pc/pccpuf
@@ -28,6 +28,7 @@
vga
sd
+ audio dma
floppy dma
aoe
@@ -71,6 +72,10 @@
usbohci
usbehci usbehcipc
+ audiosb16 dma
+ audioac97 audioac97mix
+ audiohda
+
misc
archmp mp apic
mtrr
@@ -94,6 +99,7 @@
vgact65545 +cur
vgacyber938x +cur
vgaet4000 +cur
+ vgageode +cur
vgahiqvideo +cur
vgai81x +cur
vgamach64xx +cur
--- a/sys/src/9/pc/pcf
+++ b/sys/src/9/pc/pcf
@@ -101,6 +101,7 @@
vgact65545 +cur
vgacyber938x +cur
vgaet4000 +cur
+ vgageode +cur
vgahiqvideo +cur
vgai81x +cur
vgamach64xx +cur
--- a/sys/src/cmd/auth/debug.c
+++ b/sys/src/cmd/auth/debug.c
@@ -268,7 +268,7 @@
/* 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);