diff options
author | jkh <jkh@FreeBSD.org> | 1998-10-13 09:45:59 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1998-10-13 09:45:59 +0000 |
commit | 1f01db2f6d90fbb852a03f4248255273c850b239 (patch) | |
tree | 5b0b30676edc0c8e600a5c0fcf8f967eb53fddcc | |
parent | a0bd27d4cf4379795c8b469a7a9cb00620f2217f (diff) | |
download | FreeBSD-src-1f01db2f6d90fbb852a03f4248255273c850b239.zip FreeBSD-src-1f01db2f6d90fbb852a03f4248255273c850b239.tar.gz |
switch to proper boot0
-rw-r--r-- | release/sysinstall/Makefile | 1 | ||||
-rw-r--r-- | release/sysinstall/disks.c | 6 | ||||
-rw-r--r-- | release/sysinstall/wizard.c | 28 | ||||
-rw-r--r-- | usr.sbin/sade/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/sade/disks.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/wizard.c | 28 | ||||
-rw-r--r-- | usr.sbin/sysinstall/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/sysinstall/disks.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/wizard.c | 28 |
9 files changed, 15 insertions, 90 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index cb90a66..e83d834 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -52,6 +52,7 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/boot0 >> makedevs.tmp mv makedevs.tmp makedevs.c rtermcap: ${.CURDIR}/rtermcap.c diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 9703014..de3046f 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.103 1998/09/30 21:58:36 jkh Exp $ + * $Id: disks.c,v 1.104 1998/10/07 03:15:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -135,7 +135,7 @@ print_command_summary() static u_char * getBootMgr(char *dname) { - extern u_char mbr[], bteasy17[]; + extern u_char mbr[], boot0[]; char str[80]; char *cp; int i = 0; @@ -159,7 +159,7 @@ getBootMgr(char *dname) if (cp || i) { switch (BootMgr) { case 0: - return bteasy17; + return boot0; case 1: return mbr; diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c index e7d96d7..0009666 100644 --- a/release/sysinstall/wizard.c +++ b/release/sysinstall/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: wizard.c,v 1.11 1997/02/22 14:12:40 peter Exp $ + * $Id: wizard.c,v 1.12 1998/09/08 10:46:40 jkh Exp $ * */ @@ -37,32 +37,6 @@ u_char mbr[] = { 0,0,0,0,0,0,0,0,85,170 }; -u_char bteasy17[] = { - 51,192,142,192,142,216,142,208,188,0,124,252,139,244,191,0,6,185,0,1,242, - 165,234,103,6,0,0,139,213,88,162,79,7,60,53,116,35,180,16,246,228,5,174, - 4,139,240,128,124,4,0,116,68,128,124,4,5,116,62,198,4,128,232,218,0,138, - 116,1,139,76,2,235,8,232,207,0,185,1,0,50,209,187,0,124,184,1,2,205,19, - 114,30,129,191,254,1,85,170,117,22,234,0,124,0,0,128,250,129,116,2,178, - 128,139,234,66,128,242,179,136,22,65,7,191,190,7,185,4,0,198,6,52,7,49, - 50,246,136,45,138,69,4,60,0,116,35,60,5,116,31,254,198,190,49,7,232,113, - 0,190,79,7,70,70,139,28,10,255,116,5,50,125,4,117,243,141,183,123,7,232, - 90,0,131,199,16,254,6,52,7,226,203,128,62,117,4,2,116,11,190,66,7,10,246, - 117,10,205,24,235,172,190,49,7,232,57,0,232,54,0,50,228,205,26,139,218, - 131,195,96,180,1,205,22,180,0,117,11,205,26,59,211,114,242,160,79,7,235, - 10,205,22,138,196,60,28,116,243,4,246,60,49,114,214,60,53,119,210,80,190, - 47,7,187,27,6,83,252,172,80,36,127,180,14,205,16,88,168,128,116,242,195, - 86,184,1,3,187,0,6,185,1,0,50,246,205,19,94,198,6,79,7,63,195,13,138,13, - 10,70,48,32,46,32,46,32,46,160,100,105,115,107,32,49,13,10,10,68,101,102, - 97,117,108,116,58,32,70,63,160,0,1,0,4,0,6,3,7,7,10,10,99,14,100,14,101, - 20,128,25,129,25,130,25,131,30,147,36,165,43,159,47,117,51,82,51,219,54, - 64,59,242,65,0,68,111,243,72,112,102,243,79,115,178,85,110,105,248,78,111, - 118,101,108,236,77,105,110,105,248,76,105,110,117,248,65,109,111,101,98, - 225,70,114,101,101,66,83,196,66,83,68,233,80,99,105,248,67,112,237,86,101, - 110,105,248,68,111,115,115,101,227,63,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,85,170 -}; - int scan_block(int fd, daddr_t block) { diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index cb90a66..e83d834 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -52,6 +52,7 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/boot0 >> makedevs.tmp mv makedevs.tmp makedevs.c rtermcap: ${.CURDIR}/rtermcap.c diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 9703014..de3046f 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.103 1998/09/30 21:58:36 jkh Exp $ + * $Id: disks.c,v 1.104 1998/10/07 03:15:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -135,7 +135,7 @@ print_command_summary() static u_char * getBootMgr(char *dname) { - extern u_char mbr[], bteasy17[]; + extern u_char mbr[], boot0[]; char str[80]; char *cp; int i = 0; @@ -159,7 +159,7 @@ getBootMgr(char *dname) if (cp || i) { switch (BootMgr) { case 0: - return bteasy17; + return boot0; case 1: return mbr; diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index e7d96d7..0009666 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: wizard.c,v 1.11 1997/02/22 14:12:40 peter Exp $ + * $Id: wizard.c,v 1.12 1998/09/08 10:46:40 jkh Exp $ * */ @@ -37,32 +37,6 @@ u_char mbr[] = { 0,0,0,0,0,0,0,0,85,170 }; -u_char bteasy17[] = { - 51,192,142,192,142,216,142,208,188,0,124,252,139,244,191,0,6,185,0,1,242, - 165,234,103,6,0,0,139,213,88,162,79,7,60,53,116,35,180,16,246,228,5,174, - 4,139,240,128,124,4,0,116,68,128,124,4,5,116,62,198,4,128,232,218,0,138, - 116,1,139,76,2,235,8,232,207,0,185,1,0,50,209,187,0,124,184,1,2,205,19, - 114,30,129,191,254,1,85,170,117,22,234,0,124,0,0,128,250,129,116,2,178, - 128,139,234,66,128,242,179,136,22,65,7,191,190,7,185,4,0,198,6,52,7,49, - 50,246,136,45,138,69,4,60,0,116,35,60,5,116,31,254,198,190,49,7,232,113, - 0,190,79,7,70,70,139,28,10,255,116,5,50,125,4,117,243,141,183,123,7,232, - 90,0,131,199,16,254,6,52,7,226,203,128,62,117,4,2,116,11,190,66,7,10,246, - 117,10,205,24,235,172,190,49,7,232,57,0,232,54,0,50,228,205,26,139,218, - 131,195,96,180,1,205,22,180,0,117,11,205,26,59,211,114,242,160,79,7,235, - 10,205,22,138,196,60,28,116,243,4,246,60,49,114,214,60,53,119,210,80,190, - 47,7,187,27,6,83,252,172,80,36,127,180,14,205,16,88,168,128,116,242,195, - 86,184,1,3,187,0,6,185,1,0,50,246,205,19,94,198,6,79,7,63,195,13,138,13, - 10,70,48,32,46,32,46,32,46,160,100,105,115,107,32,49,13,10,10,68,101,102, - 97,117,108,116,58,32,70,63,160,0,1,0,4,0,6,3,7,7,10,10,99,14,100,14,101, - 20,128,25,129,25,130,25,131,30,147,36,165,43,159,47,117,51,82,51,219,54, - 64,59,242,65,0,68,111,243,72,112,102,243,79,115,178,85,110,105,248,78,111, - 118,101,108,236,77,105,110,105,248,76,105,110,117,248,65,109,111,101,98, - 225,70,114,101,101,66,83,196,66,83,68,233,80,99,105,248,67,112,237,86,101, - 110,105,248,68,111,115,115,101,227,63,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,85,170 -}; - int scan_block(int fd, daddr_t block) { diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index cb90a66..e83d834 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -52,6 +52,7 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/boot0 >> makedevs.tmp mv makedevs.tmp makedevs.c rtermcap: ${.CURDIR}/rtermcap.c diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 9703014..de3046f 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.103 1998/09/30 21:58:36 jkh Exp $ + * $Id: disks.c,v 1.104 1998/10/07 03:15:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -135,7 +135,7 @@ print_command_summary() static u_char * getBootMgr(char *dname) { - extern u_char mbr[], bteasy17[]; + extern u_char mbr[], boot0[]; char str[80]; char *cp; int i = 0; @@ -159,7 +159,7 @@ getBootMgr(char *dname) if (cp || i) { switch (BootMgr) { case 0: - return bteasy17; + return boot0; case 1: return mbr; diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index e7d96d7..0009666 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: wizard.c,v 1.11 1997/02/22 14:12:40 peter Exp $ + * $Id: wizard.c,v 1.12 1998/09/08 10:46:40 jkh Exp $ * */ @@ -37,32 +37,6 @@ u_char mbr[] = { 0,0,0,0,0,0,0,0,85,170 }; -u_char bteasy17[] = { - 51,192,142,192,142,216,142,208,188,0,124,252,139,244,191,0,6,185,0,1,242, - 165,234,103,6,0,0,139,213,88,162,79,7,60,53,116,35,180,16,246,228,5,174, - 4,139,240,128,124,4,0,116,68,128,124,4,5,116,62,198,4,128,232,218,0,138, - 116,1,139,76,2,235,8,232,207,0,185,1,0,50,209,187,0,124,184,1,2,205,19, - 114,30,129,191,254,1,85,170,117,22,234,0,124,0,0,128,250,129,116,2,178, - 128,139,234,66,128,242,179,136,22,65,7,191,190,7,185,4,0,198,6,52,7,49, - 50,246,136,45,138,69,4,60,0,116,35,60,5,116,31,254,198,190,49,7,232,113, - 0,190,79,7,70,70,139,28,10,255,116,5,50,125,4,117,243,141,183,123,7,232, - 90,0,131,199,16,254,6,52,7,226,203,128,62,117,4,2,116,11,190,66,7,10,246, - 117,10,205,24,235,172,190,49,7,232,57,0,232,54,0,50,228,205,26,139,218, - 131,195,96,180,1,205,22,180,0,117,11,205,26,59,211,114,242,160,79,7,235, - 10,205,22,138,196,60,28,116,243,4,246,60,49,114,214,60,53,119,210,80,190, - 47,7,187,27,6,83,252,172,80,36,127,180,14,205,16,88,168,128,116,242,195, - 86,184,1,3,187,0,6,185,1,0,50,246,205,19,94,198,6,79,7,63,195,13,138,13, - 10,70,48,32,46,32,46,32,46,160,100,105,115,107,32,49,13,10,10,68,101,102, - 97,117,108,116,58,32,70,63,160,0,1,0,4,0,6,3,7,7,10,10,99,14,100,14,101, - 20,128,25,129,25,130,25,131,30,147,36,165,43,159,47,117,51,82,51,219,54, - 64,59,242,65,0,68,111,243,72,112,102,243,79,115,178,85,110,105,248,78,111, - 118,101,108,236,77,105,110,105,248,76,105,110,117,248,65,109,111,101,98, - 225,70,114,101,101,66,83,196,66,83,68,233,80,99,105,248,67,112,237,86,101, - 110,105,248,68,111,115,115,101,227,63,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,85,170 -}; - int scan_block(int fd, daddr_t block) { |