Get rid of the EXTERN/INIT mess; fix so that we can process this with xstr(1).
Not worth processing though, since on the i386 we only save ~3K.
This commit is contained in:
christos
parent
b0ce431f32
commit
2fe9365746
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.15 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.16 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -58,6 +58,8 @@ void backtowin(void);
|
|||
static int
|
||||
filecore_checksum(u_char *bootblock);
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
/*
|
||||
* static int filecore_checksum(u_char *bootblock)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2004/01/29 08:48:23 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On acorn26, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.16 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.17 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -58,6 +58,8 @@ void backtowin(void);
|
|||
static int
|
||||
filecore_checksum(u_char *bootblock);
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
/*
|
||||
* static int filecore_checksum(u_char *bootblock)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.14 2004/01/29 08:48:23 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.15 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On acorn32, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.37 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.38 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.18 2004/05/08 14:39:01 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.19 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -71,4 +71,4 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
/* $NetBSD: md.c,v 1.5 2003/05/18 07:58:10 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.6 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/* md.c -- Machine specific code for amd64 */
|
||||
|
||||
const char *boottype = "";
|
||||
|
||||
#include "../i386/md.c"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.16 2004/01/29 08:48:23 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.17 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
#define SET_KERNEL_GENERIC SET_KERNEL_1
|
||||
|
||||
/* Bootblock type */
|
||||
EXTERN const char *boottype INIT("");
|
||||
const char *boottype;
|
||||
|
||||
/*
|
||||
* Machine-specific command to write a new label to a disk.
|
||||
|
|
@ -93,7 +93,7 @@ EXTERN const char *boottype INIT("");
|
|||
* Default fileystem type for floppy disks.
|
||||
* On x86_64, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
#define _PATH_MBR DEFAULT_BOOTDIR "/" DEFAULT_BOOTCODE
|
||||
#define _PATH_BOOTSEL DEFAULT_BOOTDIR "/" DEFAULT_BOOTSELCODE
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.15 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.16 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -49,6 +49,8 @@
|
|||
#include "menu_defs.h"
|
||||
|
||||
|
||||
const char *fdtype = "ados";
|
||||
|
||||
/* prototypes */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.13 2004/01/29 08:48:23 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.14 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On amiga, that is ados.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ados");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.21 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.22 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -55,6 +55,7 @@
|
|||
|
||||
|
||||
/* prototypes */
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.10 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.11 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On arc, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.16 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.17 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
|
||||
|
||||
/* prototypes */
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
/*
|
||||
* any additional partition validation
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.15 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.16 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On atari, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.44 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.45 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
|
||||
/* prototypes */
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.13 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.14 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On bebox, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.14 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.15 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,8 @@
|
|||
#include "menu_defs.h"
|
||||
void backtowin(void);
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info (void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.10 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.11 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On cats, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.15 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.16 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -53,6 +53,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On evbarm, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.19 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.20 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997,2002 Piermont Information Systems Inc.
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
|
||||
/* prototypes */
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.8 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.9 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -74,8 +74,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On bebox, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.13 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.14 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "ffs";
|
||||
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.10 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.11 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -99,4 +99,4 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On hp300, if we had floppies, that would be ffs.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ffs");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.36 2003/11/30 14:36:44 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.37 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
|
||||
|
||||
/* prototypes */
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.23 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.24 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On i386, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.41 2004/03/26 20:02:22 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.42 2004/06/06 06:07:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,39 @@
|
|||
|
||||
int blk_size;
|
||||
|
||||
MAP_TYPE map_types[] = {
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVER},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVER43},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVERATA},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_FWB_COMPONENT},
|
||||
{MAP_MACOS, APPLE_PART_TYPE_MAC},
|
||||
{MAP_NETBSD, APPLE_PART_TYPE_NETBSD},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_PARTMAP},
|
||||
{MAP_OTHER, APPLE_PART_TYPE_SCRATCH},
|
||||
{MAP_NETBSD, APPLE_PART_TYPE_UNIX},
|
||||
{MAP_EOL, NULL}
|
||||
};
|
||||
|
||||
MAP map = {0, 0, 0, 0, 0, 0, 0, 0, {0}};
|
||||
|
||||
struct apple_part_map_entry new_map[] =
|
||||
{
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0xa5a5, 6, 1, NEW_MAP_SIZE & 0x7e,
|
||||
"Apple", "Apple_Partition_Map", 0, NEW_MAP_SIZE, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 64, 32,
|
||||
"Macintosh", "Apple_Driver", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 96, 64,
|
||||
"Macintosh", "Apple_Driver43", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 160, 64,
|
||||
"Macintosh", "Apple_Driver_ATA", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 224, 4096,
|
||||
"untitled", "Apple_HFS", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6,4320, 0,
|
||||
"untitled", "Apple_Free", 0, 0, 0x37 }
|
||||
};
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
/*
|
||||
* Compare lexigraphically two strings
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.19 2003/07/25 08:26:28 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.20 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -65,22 +65,7 @@ typedef struct {
|
|||
* This should match the definitions in include/machine/disklabel.h
|
||||
* and must conform to the matching rules in arch/mac68k/mac68k/disksubr.c
|
||||
*/
|
||||
EXTERN MAP_TYPE map_types[]
|
||||
#ifdef MAIN
|
||||
= {
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVER},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVER43},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_DRIVERATA},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_FWB_COMPONENT},
|
||||
{MAP_MACOS, APPLE_PART_TYPE_MAC},
|
||||
{MAP_NETBSD, APPLE_PART_TYPE_NETBSD},
|
||||
{MAP_RESERVED, APPLE_PART_TYPE_PARTMAP},
|
||||
{MAP_OTHER, APPLE_PART_TYPE_SCRATCH},
|
||||
{MAP_NETBSD, APPLE_PART_TYPE_UNIX},
|
||||
{MAP_EOL, NULL}
|
||||
}
|
||||
#endif
|
||||
;
|
||||
MAP_TYPE map_types[];
|
||||
|
||||
/*
|
||||
* Define NetBSD partition types
|
||||
|
|
@ -91,7 +76,7 @@ EXTERN MAP_TYPE map_types[]
|
|||
#define HFS_PART 4
|
||||
#define SCRATCH_PART 5
|
||||
|
||||
EXTERN int usefull; /* on install, clobber entire disk */
|
||||
int usefull; /* on install, clobber entire disk */
|
||||
|
||||
typedef struct {
|
||||
int size; /* number of blocks in map for I/O */
|
||||
|
|
@ -113,11 +98,7 @@ typedef struct {
|
|||
*/
|
||||
#define NEW_MAP_SIZE 15
|
||||
|
||||
EXTERN MAP map
|
||||
#ifdef MAIN
|
||||
= {0, 0, 0, 0, 0, 0, 0, 0, {0}}
|
||||
#endif
|
||||
;
|
||||
MAP map;
|
||||
|
||||
int edit_diskmap (void);
|
||||
void disp_selected_part (int sel);
|
||||
|
|
@ -196,24 +177,7 @@ typedef struct {
|
|||
* Has minimal entry for an old Apple SCSI driver, a newer 43 SCSI
|
||||
* driver and an IDE driver (for those Macs with IDE).
|
||||
*/
|
||||
EXTERN struct apple_part_map_entry new_map[]
|
||||
#ifdef MAIN
|
||||
= {
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0xa5a5, 6, 1, NEW_MAP_SIZE & 0x7e,
|
||||
"Apple", "Apple_Partition_Map", 0, NEW_MAP_SIZE, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 64, 32,
|
||||
"Macintosh", "Apple_Driver", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 96, 64,
|
||||
"Macintosh", "Apple_Driver43", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 160, 64,
|
||||
"Macintosh", "Apple_Driver_ATA", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6, 224, 4096,
|
||||
"untitled", "Apple_HFS", 0, 0, 0x37 },
|
||||
{ APPLE_PART_MAP_ENTRY_MAGIC, 0, 6,4320, 0,
|
||||
"untitled", "Apple_Free", 0, 0, 0x37 }
|
||||
}
|
||||
#endif
|
||||
;
|
||||
struct apple_part_map_entry new_map[];
|
||||
|
||||
/* Megs required for a full X installation. */
|
||||
#define XNEEDMB 50
|
||||
|
|
@ -246,7 +210,7 @@ EXTERN struct apple_part_map_entry new_map[]
|
|||
/*
|
||||
* Default fileystem type for floppy disks.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.32 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.33 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.14 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.15 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -67,4 +67,4 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.8 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.9 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "";
|
||||
/*
|
||||
* temporary hack
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.9 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.10 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -80,4 +80,4 @@
|
|||
*
|
||||
* On NetBSD/mipsco, we don't currently support a dedicated floppy-disk drive
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.12 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.13 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "ffs";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.10 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.11 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -90,4 +90,4 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On mvme68k, if we had floppies, that would be ffs.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ffs");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.21 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.22 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
/*
|
||||
* temporary hack
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.19 2004/01/17 05:29:29 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.20 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -76,5 +76,5 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.10 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.11 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
/*
|
||||
* temporary hack
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.9 2004/01/17 05:29:29 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.10 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -74,4 +74,4 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.29 2003/07/11 14:48:43 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.30 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -52,6 +52,8 @@
|
|||
#include "menu_defs.h"
|
||||
/* Maximum */
|
||||
#define MAX(i,j) ((i)>(j)?(i):(j))
|
||||
|
||||
const char *fdtype = "";
|
||||
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.16 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.17 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -63,4 +63,4 @@
|
|||
|
||||
#define MD_SETS_VALID SET_SYSTEM
|
||||
|
||||
EXTERN const char *fdtype INIT("");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.15 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.16 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -47,6 +47,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -76,4 +76,4 @@
|
|||
* Default fileystem type for IDE disk.
|
||||
* On playstation2, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.54 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.55 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -51,6 +51,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "";
|
||||
|
||||
/*
|
||||
* temporary hack
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.29 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.30 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -76,5 +76,5 @@
|
|||
* On pmax, we don't support a dedicated floppy-disk driver, only
|
||||
* SCSI floppy drives, so we can't recognize floppies by name.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("");
|
||||
const char *fdtype;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.1 2004/03/05 05:36:11 jmc Exp $ */
|
||||
/* $NetBSD: md.c,v 1.2 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997,2002 Piermont Information Systems Inc.
|
||||
|
|
@ -48,6 +48,7 @@
|
|||
#include "menu_defs.h"
|
||||
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
/* prototypes */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.1 2004/03/05 05:36:11 jmc Exp $ */
|
||||
/* $NetBSD: md.h,v 1.2 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On bebox, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.19 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.20 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -53,6 +53,7 @@
|
|||
#include "endian.h"
|
||||
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
/* prototypes */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On prep, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.21 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.22 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -47,6 +47,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
/* prototypes */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.9 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.10 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -73,9 +73,9 @@
|
|||
|
||||
/*
|
||||
* Default fileystem type for floppy disks.
|
||||
* On bebox, that is msdos.
|
||||
* On sandpoint, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.14 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.15 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "";
|
||||
struct utsname instsys;
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.17 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.18 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -85,5 +85,5 @@
|
|||
* On sgimips, we don't support a dedicated floppy-disk driver, only
|
||||
* SCSI floppy drives, so we can't recognize floppies by name.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("");
|
||||
const char *fdtype;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.15 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.16 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -53,6 +53,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:07:01 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -62,10 +62,10 @@
|
|||
#define DISKLABEL_CMD "disklabel -w -r"
|
||||
|
||||
/*
|
||||
* Default fileystem type for floppy disks.
|
||||
* Default filesystem type for floppy disks.
|
||||
* On shark, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
||||
/*
|
||||
* prototypes for MD code.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.41 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.42 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -58,6 +58,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "ffs";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.20 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.21 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -79,4 +79,4 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ffs");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.16 2003/12/10 19:42:51 martin Exp $ */
|
||||
/* $NetBSD: md.c,v 1.17 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -56,6 +56,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "ffs";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.11 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.12 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -72,4 +72,4 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ffs");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.27 2004/05/10 01:50:32 mhitch Exp $ */
|
||||
/* $NetBSD: md.c,v 1.28 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -56,6 +56,8 @@
|
|||
#include "msg_defs.h"
|
||||
#include "menu_defs.h"
|
||||
|
||||
const char *fdtype = "ffs";
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.17 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.h,v 1.18 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -77,5 +77,5 @@
|
|||
/*
|
||||
* Default file system type for floppies.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("ffs");
|
||||
const char *fdtype;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.c,v 1.27 2003/11/30 14:36:45 dsl Exp $ */
|
||||
/* $NetBSD: md.c,v 1.28 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -67,6 +67,8 @@ int md_need_newdisk = 0;
|
|||
/* prototypes */
|
||||
static int md_newdisk (void);
|
||||
|
||||
const char *fdtype = "msdos";
|
||||
|
||||
|
||||
int
|
||||
md_get_info(void)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: md.h,v 1.16 2004/01/29 08:48:24 lukem Exp $ */
|
||||
/* $NetBSD: md.h,v 1.17 2004/06/06 06:07:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -95,4 +95,4 @@
|
|||
* Default fileystem type for floppy disks.
|
||||
* On x68k, that is msdos.
|
||||
*/
|
||||
EXTERN const char *fdtype INIT("msdos");
|
||||
const char *fdtype;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bsddisklabel.c,v 1.27 2004/03/26 19:55:13 dsl Exp $ */
|
||||
/* $NetBSD: bsddisklabel.c,v 1.28 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -366,14 +366,18 @@ get_ptn_sizes(int part_start, int sectors, int no_swap)
|
|||
|
||||
static struct ptn_info pi = { -1, {
|
||||
#define PI_ROOT 0
|
||||
{ PART_ROOT, "/", DEFROOTSIZE, DEFROOTSIZE },
|
||||
{ PART_ROOT, { '/', '\0' },
|
||||
DEFROOTSIZE, DEFROOTSIZE },
|
||||
#define PI_SWAP 1
|
||||
{ PART_SWAP, "swap", DEFSWAPSIZE, DEFSWAPSIZE },
|
||||
{ PART_TMP_MFS, "tmp (mfs)", 64 },
|
||||
{ PART_SWAP, { 's', 'w', 'a', 'p', '\0' },
|
||||
DEFSWAPSIZE, DEFSWAPSIZE },
|
||||
{ PART_TMP_MFS,
|
||||
{ 't', 'm', 'p', ' ', '(', 'm', 'f', 's', ')', '\0' },
|
||||
64 },
|
||||
#define PI_USR 3
|
||||
{ PART_USR, "/usr", DEFUSRSIZE },
|
||||
{ PART_ANY, "/var", DEFVARSIZE },
|
||||
{ PART_ANY, "/home", 0 },
|
||||
{ PART_USR, { '/', 'u', 's', 'r', '\0' }, DEFUSRSIZE },
|
||||
{ PART_ANY, { '/', 'v', 'a', 'r', '\0' }, DEFVARSIZE },
|
||||
{ PART_ANY, { '/', 'h', 'o', 'm', 'e', '\0' }, 0 },
|
||||
}, {
|
||||
{ NULL, OPT_NOMENU, 0, set_ptn_size },
|
||||
{ MSG_askunits, MENU_sizechoice, OPT_SUB, NULL },
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: defs.h,v 1.114 2004/06/05 21:18:59 dsl Exp $ */
|
||||
/* $NetBSD: defs.h,v 1.115 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -58,15 +58,6 @@ deconst(const void *p)
|
|||
#define min(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define max(a,b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
/* Define for external varible use */
|
||||
#ifdef MAIN
|
||||
#define EXTERN
|
||||
#define INIT(x) = x
|
||||
#else
|
||||
#define EXTERN extern
|
||||
#define INIT(x)
|
||||
#endif
|
||||
|
||||
/* constants */
|
||||
#define MEG (1024 * 1024)
|
||||
#define STRSIZE 255
|
||||
|
|
@ -171,61 +162,61 @@ typedef struct _partinfo {
|
|||
|
||||
/* variables */
|
||||
|
||||
EXTERN int debug; /* set by -D option */
|
||||
int debug; /* set by -D option */
|
||||
|
||||
EXTERN char rel[SSTRSIZE] INIT(REL);
|
||||
EXTERN char machine[SSTRSIZE] INIT(MACH);
|
||||
char rel[SSTRSIZE];
|
||||
char machine[SSTRSIZE];
|
||||
|
||||
EXTERN int yesno;
|
||||
EXTERN int ignorerror;
|
||||
EXTERN int ttysig_ignore;
|
||||
EXTERN pid_t ttysig_forward;
|
||||
EXTERN int layoutkind;
|
||||
EXTERN int sizemult INIT(1);
|
||||
EXTERN const char *multname;
|
||||
EXTERN const char *shellpath;
|
||||
int yesno;
|
||||
int ignorerror;
|
||||
int ttysig_ignore;
|
||||
pid_t ttysig_forward;
|
||||
int layoutkind;
|
||||
int sizemult;
|
||||
const char *multname;
|
||||
const char *shellpath;
|
||||
|
||||
/* loging variables */
|
||||
|
||||
EXTERN int logging;
|
||||
EXTERN int scripting;
|
||||
EXTERN FILE *logfp;
|
||||
EXTERN FILE *script;
|
||||
int logging;
|
||||
int scripting;
|
||||
FILE *logfp;
|
||||
FILE *script;
|
||||
|
||||
/* Hardware variables */
|
||||
EXTERN unsigned long ramsize INIT(0);
|
||||
EXTERN unsigned int rammb INIT(0);
|
||||
unsigned long ramsize;
|
||||
unsigned int rammb ;
|
||||
|
||||
/* Actual name of the disk. */
|
||||
EXTERN char diskdev[SSTRSIZE] INIT("");
|
||||
EXTERN int no_mbr; /* set for raid (etc) */
|
||||
EXTERN int rootpart; /* partition we install into */
|
||||
EXTERN const char *disktype INIT("unknown"); /* ST506, SCSI, ... */
|
||||
char diskdev[SSTRSIZE];
|
||||
int no_mbr; /* set for raid (etc) */
|
||||
int rootpart; /* partition we install into */
|
||||
const char *disktype; /* ST506, SCSI, ... */
|
||||
|
||||
/* Area of disk we can allocate, start and size in disk sectors. */
|
||||
EXTERN int ptstart, ptsize;
|
||||
int ptstart, ptsize;
|
||||
|
||||
/* Actual values for current disk - set by find_disks() or md_get_info() */
|
||||
EXTERN int sectorsize;
|
||||
EXTERN int dlcyl, dlhead, dlsec, dlsize, dlcylsize;
|
||||
EXTERN int current_cylsize;
|
||||
EXTERN int root_limit;
|
||||
int sectorsize;
|
||||
int dlcyl, dlhead, dlsec, dlsize, dlcylsize;
|
||||
int current_cylsize;
|
||||
int root_limit;
|
||||
|
||||
/* Information for the NetBSD disklabel */
|
||||
enum DLTR { PART_A, PART_B, PART_C, PART_D, PART_E, PART_F, PART_G, PART_H,
|
||||
PART_I, PART_J, PART_K, PART_L, PART_M, PART_N, PART_O, PART_P};
|
||||
#define partition_name(x) ('a' + (x))
|
||||
EXTERN partinfo oldlabel[MAXPARTITIONS]; /* What we found on the disk */
|
||||
EXTERN partinfo bsdlabel[MAXPARTITIONS]; /* What we want it to look like */
|
||||
EXTERN int tmp_mfs_size INIT(0);
|
||||
partinfo oldlabel[MAXPARTITIONS]; /* What we found on the disk */
|
||||
partinfo bsdlabel[MAXPARTITIONS]; /* What we want it to look like */
|
||||
int tmp_mfs_size;
|
||||
|
||||
#define DISKNAME_SIZE 16
|
||||
EXTERN char bsddiskname[DISKNAME_SIZE] INIT("mydisk");
|
||||
EXTERN const char *doessf INIT("");
|
||||
char bsddiskname[DISKNAME_SIZE];
|
||||
const char *doessf;
|
||||
|
||||
/* Relative file name for storing a distribution. */
|
||||
EXTERN char dist_dir[STRSIZE] INIT("/usr/INSTALL");
|
||||
EXTERN int clean_dist_dir INIT(0);
|
||||
char dist_dir[STRSIZE];
|
||||
int clean_dist_dir;
|
||||
/* Absolute path name where the distribution should be extracted from. */
|
||||
|
||||
#if !defined(SYSINST_FTP_HOST)
|
||||
|
|
@ -237,32 +228,32 @@ EXTERN int clean_dist_dir INIT(0);
|
|||
#endif
|
||||
|
||||
/* Abs. path we extract from */
|
||||
EXTERN char ext_dir[STRSIZE] INIT("");
|
||||
char ext_dir[STRSIZE];
|
||||
|
||||
/* Place we look in all fs types */
|
||||
EXTERN char set_dir[STRSIZE] INIT("/" MACH "/binary/sets");
|
||||
char set_dir[STRSIZE];
|
||||
|
||||
EXTERN char ftp_host[STRSIZE] INIT(SYSINST_FTP_HOST);
|
||||
EXTERN char ftp_dir[STRSIZE] INIT(SYSINST_FTP_DIR);
|
||||
EXTERN char ftp_user[SSTRSIZE] INIT("ftp");
|
||||
EXTERN char ftp_pass[STRSIZE] INIT("");
|
||||
EXTERN char ftp_proxy[STRSIZE] INIT("");
|
||||
char ftp_host[STRSIZE];
|
||||
char ftp_dir[STRSIZE] ;
|
||||
char ftp_user[SSTRSIZE];
|
||||
char ftp_pass[STRSIZE];
|
||||
char ftp_proxy[STRSIZE];
|
||||
|
||||
EXTERN char nfs_host[STRSIZE] INIT("");
|
||||
EXTERN char nfs_dir[STRSIZE] INIT("/bsd/release");
|
||||
char nfs_host[STRSIZE];
|
||||
char nfs_dir[STRSIZE];
|
||||
|
||||
EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0a");
|
||||
char cdrom_dev[SSTRSIZE];
|
||||
|
||||
EXTERN char localfs_dev[SSTRSIZE] INIT("sd0a");
|
||||
EXTERN char localfs_fs[SSTRSIZE] INIT("ffs");
|
||||
EXTERN char localfs_dir[STRSIZE] INIT("release");
|
||||
char localfs_dev[SSTRSIZE];
|
||||
char localfs_fs[SSTRSIZE];
|
||||
char localfs_dir[STRSIZE];
|
||||
|
||||
EXTERN char targetroot_mnt[SSTRSIZE] INIT ("/targetroot");
|
||||
EXTERN char distfs_mnt[SSTRSIZE] INIT ("/mnt2");
|
||||
char targetroot_mnt[SSTRSIZE];
|
||||
char distfs_mnt[SSTRSIZE];
|
||||
|
||||
EXTERN int mnt2_mounted INIT(0);
|
||||
int mnt2_mounted;
|
||||
|
||||
EXTERN char dist_postfix[SSTRSIZE] INIT(".tgz");
|
||||
char dist_postfix[SSTRSIZE];
|
||||
|
||||
/* selescted sets */
|
||||
extern distinfo dist_list[];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: main.c,v 1.44 2004/06/05 21:18:59 dsl Exp $ */
|
||||
/* $NetBSD: main.c,v 1.45 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -48,7 +48,6 @@
|
|||
#include <fcntl.h>
|
||||
#include <dirent.h>
|
||||
|
||||
#define MAIN
|
||||
#include "defs.h"
|
||||
#include "md.h"
|
||||
#include "msg_defs.h"
|
||||
|
|
@ -56,6 +55,7 @@
|
|||
#include "txtwalk.h"
|
||||
|
||||
int main(int, char **);
|
||||
static void init(void);
|
||||
static void select_language(void);
|
||||
static void usage(void);
|
||||
static void miscsighandler(int);
|
||||
|
|
@ -73,6 +73,40 @@ FILE *script; /* script file */
|
|||
extern int log_flip(void);
|
||||
#endif
|
||||
|
||||
static void
|
||||
init(void)
|
||||
{
|
||||
(void)strlcpy(rel, REL, SSTRSIZE);
|
||||
(void)strlcpy(machine, MACH, SSTRSIZE);
|
||||
sizemult = 1;
|
||||
ramsize = 0;
|
||||
rammb = 0;
|
||||
(void)strlcpy(diskdev, "", SSTRSIZE);
|
||||
disktype = "unknown";
|
||||
tmp_mfs_size = 0;
|
||||
(void)strlcpy(bsddiskname, "mydisk", DISKNAME_SIZE);
|
||||
doessf = "";
|
||||
(void)strlcpy(dist_dir, "/usr/INSTALL", STRSIZE);
|
||||
clean_dist_dir = 0;
|
||||
(void)strlcpy(ext_dir, "", STRSIZE);
|
||||
(void)strlcpy(set_dir, "/" MACH "/binary/sets", STRSIZE);
|
||||
(void)strlcpy(ftp_host, SYSINST_FTP_HOST, STRSIZE);
|
||||
(void)strlcpy(ftp_dir, SYSINST_FTP_DIR, STRSIZE);
|
||||
(void)strlcpy(ftp_user, "ftp", SSTRSIZE);
|
||||
(void)strlcpy(ftp_pass, "", STRSIZE);
|
||||
(void)strlcpy(ftp_proxy, "", STRSIZE);
|
||||
(void)strlcpy(nfs_host, "", STRSIZE);
|
||||
(void)strlcpy(nfs_dir, "/bsd/release", STRSIZE);
|
||||
(void)strlcpy(cdrom_dev, "cd0a", SSTRSIZE);
|
||||
(void)strlcpy(localfs_dev, "sd0a", SSTRSIZE);
|
||||
(void)strlcpy(localfs_fs, "ffs", SSTRSIZE);
|
||||
(void)strlcpy(localfs_dir, "release", STRSIZE);
|
||||
(void)strlcpy(targetroot_mnt, "/targetroot", SSTRSIZE);
|
||||
(void)strlcpy(distfs_mnt, "/mnt2", SSTRSIZE);
|
||||
mnt2_mounted = 0;
|
||||
(void)strlcpy(dist_postfix, ".tgz", SSTRSIZE);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
|
|
@ -80,6 +114,7 @@ main(int argc, char **argv)
|
|||
int ch;
|
||||
|
||||
logging = 0; /* shut them off unless turned on by the user */
|
||||
init();
|
||||
#ifdef DEBUG
|
||||
log_flip();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mbr.h,v 1.19 2004/04/25 21:55:18 dsl Exp $ */
|
||||
/* $NetBSD: mbr.h,v 1.20 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997, 1988 Piermont Information Systems Inc.
|
||||
|
|
@ -78,9 +78,9 @@ struct mbr_info_t {
|
|||
};
|
||||
|
||||
/* incore fdisk (mbr, bios) geometry */
|
||||
EXTERN int bcyl, bhead, bsec, bsize, bcylsize;
|
||||
int bcyl, bhead, bsec, bsize, bcylsize;
|
||||
|
||||
EXTERN mbr_info_t mbr;
|
||||
mbr_info_t mbr;
|
||||
|
||||
#ifdef BOOTSEL
|
||||
struct mbr_bootsel *mbs;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: target.c,v 1.46 2003/12/28 05:30:47 christos Exp $ */
|
||||
/* $NetBSD: target.c,v 1.47 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Jonathan Stone
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: target.c,v 1.46 2003/12/28 05:30:47 christos Exp $");
|
||||
__RCSID("$NetBSD: target.c,v 1.47 2004/06/06 06:06:59 christos Exp $");
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -559,7 +559,10 @@ target_realpath(const char *path, char *resolved)
|
|||
struct stat sb;
|
||||
int fd, n, rootd, serrno, nlnk = 0;
|
||||
char *p, *q, wbuf[MAXPATHLEN];
|
||||
char solidus[] = "/", empty[] = "";
|
||||
char solidus[2], empty[1];
|
||||
solidus[0] = '/';
|
||||
solidus[1] = '\0';
|
||||
empty[0] = '\0';
|
||||
|
||||
/* Save the starting point. */
|
||||
if ((fd = open(".", O_RDONLY)) < 0) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: util.c,v 1.120 2004/06/05 21:19:00 dsl Exp $ */
|
||||
/* $NetBSD: util.c,v 1.121 2004/06/06 06:06:59 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -246,7 +246,7 @@ run_makedev(void)
|
|||
int
|
||||
get_via_floppy(void)
|
||||
{
|
||||
char fddev[STRSIZE] = "/dev/fd0a";
|
||||
char fddev[STRSIZE];
|
||||
char fname[STRSIZE];
|
||||
char full_name[STRSIZE];
|
||||
char catcmd[STRSIZE];
|
||||
|
|
@ -255,6 +255,7 @@ get_via_floppy(void)
|
|||
int first;
|
||||
struct stat sb;
|
||||
|
||||
(void)strlcpy(fddev, "/dev/fd0a", STRSIZE);
|
||||
cd_dist_dir("unloading from floppy");
|
||||
|
||||
msg_prompt_add(MSG_fddev, fddev, fddev, STRSIZE);
|
||||
|
|
|
|||
Loading…
Reference in New Issue