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

dont put plan9.ini bootimage in cd root

Browse source
This commit is contained in:
cinap_lenrek 2011-04-12 01:09:16 +00:00
parent 994606821c
commit d1fd22d72b
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
cfg/plan9.ini Normal file
View file

15
sys/lib/dist/mkfile vendored
View file

@ -1,17 +1,12 @@
scr=/tmp/cdstub
iso=/tmp/9front.iso
cd:V: $iso
clean:V:
rm -fr $scr $iso
rm -fr $iso
%.iso: /n/src9/386/9bootiso
mkdir -p $scr
cp $prereq $scr
cp pc/plan9.ini.cd $scr/plan9.ini
bind -a /n/src9 $scr
disk/mk9660 -9cj -B 9bootiso -p pc/cdproto -s $scr -v 'Plan 9 Front' $target
unmount $scr
rm -fr $scr
%.iso: pc/plan9.ini.cd
bind $prereq /n/src9/cfg/plan9.ini
disk/mk9660 -9cj -B 386/9bootiso -p pc/cdproto -s /n/src9 -v 'Plan 9 Front' $target
unmount /n/src9/cfg/plan9.ini

2
sys/src/boot/pc/iso.c
View file

@ -155,7 +155,7 @@ start(void *sp)
readn(&ex, origin, ex.len);
close(&ex);
if(isowalk(f = &ex, drive, "plan9.ini")){
if(isowalk(f = &ex, drive, "/cfg/plan9.ini")){
print("no config\r\n");
f = 0;
}

1
sys/src/boot/pc/l.s
View file

@ -237,6 +237,7 @@ TEXT readsect(SB), $0
#ifdef ISO
TEXT bootname(SB), $0
BYTE $'3'; BYTE $'8'; BYTE $'6'; BYTE $'/';
BYTE $'9'; BYTE $'b'; BYTE $'o'; BYTE $'o';
BYTE $'t'; BYTE $'i'; BYTE $'s'; BYTE $'o';
BYTE $0