diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-12 01:09:16 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-12 01:09:16 +0000 |
| commit | d1fd22d72bfc5425863d4249e022f833ea928940 (patch) | |
| tree | ad1c242128d829449b7854bafb05d002b9e23736 | |
| parent | 994606821c685d34a99f890ea6e59bdfdc756dbd (diff) | |
dont put plan9.ini bootimage in cd root
| -rw-r--r-- | cfg/plan9.ini | 0 | ||||
| -rw-r--r-- | sys/lib/dist/mkfile | 15 | ||||
| -rw-r--r-- | sys/src/boot/pc/iso.c | 2 | ||||
| -rw-r--r-- | sys/src/boot/pc/l.s | 1 |
4 files changed, 7 insertions, 11 deletions
diff --git a/cfg/plan9.ini b/cfg/plan9.ini new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/cfg/plan9.ini diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile index 6722061d4..954d288f3 100644 --- a/sys/lib/dist/mkfile +++ b/sys/lib/dist/mkfile @@ -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 diff --git a/sys/src/boot/pc/iso.c b/sys/src/boot/pc/iso.c index 1d6bea2b7..f030be189 100644 --- a/sys/src/boot/pc/iso.c +++ b/sys/src/boot/pc/iso.c @@ -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; } diff --git a/sys/src/boot/pc/l.s b/sys/src/boot/pc/l.s index 23cb1539d..8691a210a 100644 --- a/sys/src/boot/pc/l.s +++ b/sys/src/boot/pc/l.s @@ -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 |