From ea1dce70073a184162aec4c81571046067b70ef8 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 4 Jun 1999 10:01:53 +0000 Subject: [PATCH] Switch to proper mbr. OK'ed by: jkh,rnordier --- release/sysinstall/Makefile | 1 + release/sysinstall/wizard.c | 25 +------------------------ usr.sbin/sade/Makefile | 1 + usr.sbin/sade/wizard.c | 25 +------------------------ usr.sbin/sysinstall/Makefile | 1 + usr.sbin/sysinstall/wizard.c | 25 +------------------------ 6 files changed, 6 insertions(+), 72 deletions(-) diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index e837479c6334..439639b54531 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -53,6 +53,7 @@ makedevs.c: Makefile rtermcap keymap.h >> makedevs.tmp .if ${MACHINE_ARCH} != "alpha" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp .endif mv makedevs.tmp makedevs.c diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c index 000966616993..7f713318dac9 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.12 1998/09/08 10:46:40 jkh Exp $ + * $Id: wizard.c,v 1.13 1998/10/13 09:45:59 jkh Exp $ * */ @@ -14,29 +14,6 @@ #include #include -u_char mbr[] = { - 250,51,192,142,208,188,0,124,139,244,80,7,80,31,251,252,191,0,6,185,0,1, - 242,165,234,29,6,0,0,190,190,7,179,4,128,60,128,116,14,128,60,0,117,28, - 131,198,16,254,203,117,239,205,24,139,20,139,76,2,139,238,131,198,16,254, - 203,116,26,128,60,0,116,244,190,139,6,172,60,0,116,11,86,187,7,0,180,14, - 205,16,94,235,240,235,254,191,5,0,187,0,124,184,1,2,87,205,19,95,115,12, - 51,192,205,19,79,117,237,190,163,6,235,211,190,194,6,191,254,125,129,61, - 85,170,117,199,139,245,234,0,124,0,0,73,110,118,97,108,105,100,32,112,97, - 114,116,105,116,105,111,110,32,116,97,98,108,101,0,69,114,114,111,114,32, - 108,111,97,100,105,110,103,32,111,112,101,114,97,116,105,110,103,32,115, - 121,115,116,101,109,0,77,105,115,115,105,110,103,32,111,112,101,114,97, - 116,105,110,103,32,115,121,115,116,101,109,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,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,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,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,128, - 1,1,0,4,15,63,60,63,0,0,0,241,239,0,0,0,0,1,61,5,15,63,243,48,240,0,0,144, - 208,2,0,0,0,1,244,165,15,63,170,192,192,3,0,144,208,2,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 e837479c6334..439639b54531 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -53,6 +53,7 @@ makedevs.c: Makefile rtermcap keymap.h >> makedevs.tmp .if ${MACHINE_ARCH} != "alpha" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp .endif mv makedevs.tmp makedevs.c diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index 000966616993..7f713318dac9 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.12 1998/09/08 10:46:40 jkh Exp $ + * $Id: wizard.c,v 1.13 1998/10/13 09:45:59 jkh Exp $ * */ @@ -14,29 +14,6 @@ #include #include -u_char mbr[] = { - 250,51,192,142,208,188,0,124,139,244,80,7,80,31,251,252,191,0,6,185,0,1, - 242,165,234,29,6,0,0,190,190,7,179,4,128,60,128,116,14,128,60,0,117,28, - 131,198,16,254,203,117,239,205,24,139,20,139,76,2,139,238,131,198,16,254, - 203,116,26,128,60,0,116,244,190,139,6,172,60,0,116,11,86,187,7,0,180,14, - 205,16,94,235,240,235,254,191,5,0,187,0,124,184,1,2,87,205,19,95,115,12, - 51,192,205,19,79,117,237,190,163,6,235,211,190,194,6,191,254,125,129,61, - 85,170,117,199,139,245,234,0,124,0,0,73,110,118,97,108,105,100,32,112,97, - 114,116,105,116,105,111,110,32,116,97,98,108,101,0,69,114,114,111,114,32, - 108,111,97,100,105,110,103,32,111,112,101,114,97,116,105,110,103,32,115, - 121,115,116,101,109,0,77,105,115,115,105,110,103,32,111,112,101,114,97, - 116,105,110,103,32,115,121,115,116,101,109,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,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,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,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,128, - 1,1,0,4,15,63,60,63,0,0,0,241,239,0,0,0,0,1,61,5,15,63,243,48,240,0,0,144, - 208,2,0,0,0,1,244,165,15,63,170,192,192,3,0,144,208,2,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 e837479c6334..439639b54531 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -53,6 +53,7 @@ makedevs.c: Makefile rtermcap keymap.h >> makedevs.tmp .if ${MACHINE_ARCH} != "alpha" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp + file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp .endif mv makedevs.tmp makedevs.c diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index 000966616993..7f713318dac9 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.12 1998/09/08 10:46:40 jkh Exp $ + * $Id: wizard.c,v 1.13 1998/10/13 09:45:59 jkh Exp $ * */ @@ -14,29 +14,6 @@ #include #include -u_char mbr[] = { - 250,51,192,142,208,188,0,124,139,244,80,7,80,31,251,252,191,0,6,185,0,1, - 242,165,234,29,6,0,0,190,190,7,179,4,128,60,128,116,14,128,60,0,117,28, - 131,198,16,254,203,117,239,205,24,139,20,139,76,2,139,238,131,198,16,254, - 203,116,26,128,60,0,116,244,190,139,6,172,60,0,116,11,86,187,7,0,180,14, - 205,16,94,235,240,235,254,191,5,0,187,0,124,184,1,2,87,205,19,95,115,12, - 51,192,205,19,79,117,237,190,163,6,235,211,190,194,6,191,254,125,129,61, - 85,170,117,199,139,245,234,0,124,0,0,73,110,118,97,108,105,100,32,112,97, - 114,116,105,116,105,111,110,32,116,97,98,108,101,0,69,114,114,111,114,32, - 108,111,97,100,105,110,103,32,111,112,101,114,97,116,105,110,103,32,115, - 121,115,116,101,109,0,77,105,115,115,105,110,103,32,111,112,101,114,97, - 116,105,110,103,32,115,121,115,116,101,109,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,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,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,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,128, - 1,1,0,4,15,63,60,63,0,0,0,241,239,0,0,0,0,1,61,5,15,63,243,48,240,0,0,144, - 208,2,0,0,0,1,244,165,15,63,170,192,192,3,0,144,208,2,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) {