xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2011-07-21 15:59:54 +02:00
parent 474bc6a14a 43f327485d
commit 3202d39042
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rc/bin/fshalt
View file

@ -3,6 +3,7 @@
# and optionally reboot # and optionally reboot
rfork e rfork e
reboot=no reboot=no
scram=no
switch ($#*) { switch ($#*) {
case 0 case 0
case 1 case 1
@ -14,6 +15,8 @@ case *
path=(/bin) path=(/bin)
builtin cd / builtin cd /
bind -c '#s' /srv
bind '#p' /proc
unmount /mnt/consoles >[2]/dev/null unmount /mnt/consoles >[2]/dev/null
kill consolefs | rc # don't compete with /mnt/consoles kill consolefs | rc # don't compete with /mnt/consoles
@ -33,8 +36,11 @@ for (i in $k){
sleep 2 sleep 2
} }
# for scram # for scram, don't scram other systems
bind -b '#P' /dev 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) # halting (binaries we run can't be on the fs we're halting)
ramfs ramfs
@ -79,7 +85,8 @@ fn x {
echo rebooting... echo rebooting...
echo reboot >'#c/reboot' echo reboot >'#c/reboot'
} }
if not scram if (~ $scram yes)
scram
} }
x x

6
sys/src/9/pc/pccpuf
View file

@ -28,6 +28,7 @@ dev
vga vga
sd sd
audio dma
floppy dma floppy dma
aoe aoe
@ -71,6 +72,10 @@ link
usbohci usbohci
usbehci usbehcipc usbehci usbehcipc
audiosb16 dma
audioac97 audioac97mix
audiohda
misc misc
archmp mp apic archmp mp apic
mtrr mtrr
@ -94,6 +99,7 @@ misc
vgact65545 +cur vgact65545 +cur
vgacyber938x +cur vgacyber938x +cur
vgaet4000 +cur vgaet4000 +cur
vgageode +cur
vgahiqvideo +cur vgahiqvideo +cur
vgai81x +cur vgai81x +cur
vgamach64xx +cur vgamach64xx +cur

1
sys/src/9/pc/pcf
View file

@ -101,6 +101,7 @@ misc
vgact65545 +cur vgact65545 +cur
vgacyber938x +cur vgacyber938x +cur
vgaet4000 +cur vgaet4000 +cur
vgageode +cur
vgahiqvideo +cur vgahiqvideo +cur
vgai81x +cur vgai81x +cur
vgamach64xx +cur vgamach64xx +cur

2
sys/src/cmd/auth/debug.c
View file

@ -268,7 +268,7 @@ authfutz(char *dom, char *user)
/* try ticket request using bootes key */ /* try ticket request using bootes key */
snprint(prompt, sizeof prompt, "\tcpu server owner for domain %s ", dom); 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); convTR2M(&tr, trbuf);
if(_asgetticket(fd, trbuf, tbuf) < 0){ if(_asgetticket(fd, trbuf, tbuf) < 0){
close(fd); close(fd);