vx32

Local 9vx git repository for patches.
git clone git://r-36.net/vx32
Log | Files | Refs

commit e5c176d25652c67e3199d1f7b8565c559a8a1f38
parent 5220b28ac197e5f8f6ecc35be4be832b5f9e8d05
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Mon, 28 Jun 2010 00:53:39 +0200

bootboot.ed

--HG--
rename : src/9vx/a/bootboot.ed => src/9vx/bootboot.ed

Diffstat:
src/9vx/a/bootboot.ed | 58----------------------------------------------------------
src/9vx/bootboot.ed | 62++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/9vx/a/bootboot.ed b/src/9vx/a/bootboot.ed @@ -1,58 +0,0 @@ -diff -e plan9/sys/src/9/boot/aux.c 9vx/sys/src/9/boot/aux.c -73,74c - exits(buf); -. -diff -e plan9/sys/src/9/boot/boot.c 9vx/sys/src/9/boot/boot.c -154a -Init: -. -94a - if(localroot){ - srvcreate("boot", fd); - goto Init; - } -. -6a -char *localroot; -. -diff -e plan9/sys/src/9/boot/boot.h 9vx/sys/src/9/boot/boot.h -16a -extern char* localroot; -. -diff -e plan9/sys/src/9/boot/local.c 9vx/sys/src/9/boot/local.c -278d -276a - if((fd = connectlocalroot()) < 0) -. -264a -connectlocalroot(void) -{ - int fd; - char buf[1024]; - - if(stat(buf, statbuf, sizeof statbuf) < 0) - return -1; - localroot = disk; - - /* create working fd for /srv/boot */ - fd = open("#~/mntloop", ORDWR); - if(fd < 0){ - print("open #~/mntloop: %r\n"); - return -1; - } - write(fd, disk, strlen(disk)); - return fd; -} - -int -. -171c - return; -. -diff -e plan9/sys/src/9/pc/pcf 9vx/sys/src/9/pc/pcf -119a - tcp -. -117,118c -boot boot #Z/usr/local/9vx -. diff --git a/src/9vx/bootboot.ed b/src/9vx/bootboot.ed @@ -0,0 +1,62 @@ +diff -e plan9/sys/src/9//boot/aux.c 9vx/sys/src/9//boot/aux.c +73,74c + exits(buf); +. +diff -e plan9/sys/src/9//boot/boot.c 9vx/sys/src/9//boot/boot.c +154a +Init: +. +94a + if(localroot){ + bind(localroot, "/", MAFTER); + srvcreate("boot", fd); + goto Init; + } +. +6a +char *localroot; +. +diff -e plan9/sys/src/9//boot/boot.h 9vx/sys/src/9//boot/boot.h +16a +extern char* localroot; +. +diff -e plan9/sys/src/9//boot/local.c 9vx/sys/src/9//boot/local.c +278c + //if((fd = connectlocalkfs()) < 0) +. +276a + if((fd = connectlocalroot()) < 0) +. +264a +connectlocalroot(void) +{ + int fd; + char buf[1024]; + + snprint(buf, sizeof buf, "%s/386/bin/rc", disk); + if(stat(buf, statbuf, sizeof statbuf) < 0) + return -1; + localroot = disk; + + /* create working fd for /srv/boot */ + fd = open("#~/mntloop", ORDWR); + if(fd < 0){ + print("open #~/mntloop: %r\n"); + return -1; + } + write(fd, disk, strlen(disk)); + return fd; +} + +int +. +171c + return; +. +diff -e plan9/sys/src/9//pc/pcf 9vx/sys/src/9//pc/pcf +119a + tcp +. +117,118c +boot boot #Z/usr/local/9vx +.