aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-28 22:50:00 +0000
committerhpa <hpa>2004-12-28 22:50:00 +0000
commit539090d9498ab259dd625de9a45646da3b9c5831 (patch)
tree007e4d5acd7064e4730f5390c0f38eb14e736f9b
parent0398ecc18ca2456f3bfc616811004d09e9233102 (diff)
downloadsyslinux.git-539090d9498ab259dd625de9a45646da3b9c5831.tar.gz
syslinux.git-539090d9498ab259dd625de9a45646da3b9c5831.tar.xz
syslinux.git-539090d9498ab259dd625de9a45646da3b9c5831.zip
Support the -m and -a options for the DOS installer as well
-rw-r--r--NEWS5
-rw-r--r--dos/Makefile4
-rw-r--r--dos/syslinux.c236
-rw-r--r--win32/syslinux.c24
4 files changed, 244 insertions, 25 deletions
diff --git a/NEWS b/NEWS
index 9992f804..0e8b4ae0 100644
--- a/NEWS
+++ b/NEWS
@@ -32,10 +32,9 @@ Changes in 3.00:
server.domain.com::filename), which downloads a file from an
alternate TFTP server, or just a :: (e.g. ::filename), which
suppresses the common pathname prefix. See pxelinux.doc.
- * SYSLINUX: Add an -m option to the Win32 installer (only!)
+ * SYSLINUX: Add an -m option to the DOS and Win32 installers
to write an MBR and -a to mark the partition SYSLINUX is
- being installed on active. This will hopefully be added
- to the DOS installer later.
+ being installed on active.
Changes in 2.13:
* MEMDISK: Fix command-line parsing "brown paper bag" class
diff --git a/dos/Makefile b/dos/Makefile
index a00d72e6..ca17a64d 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -1,4 +1,4 @@
-CC = gcc -m32 -mregparm=3 -DREGPARM=3
+CC = gcc -m32 -mregparm=3 -DREGPARM=3 -DDEBUG
LD = ld -m elf_i386
OBJCOPY = objcopy
OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
@@ -10,7 +10,7 @@ RANLIB = ranlib
LIBGCC := $(shell $(CC) --print-libgcc)
SRCS = syslinux.c \
- ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c \
+ ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c ../mbr_bin.c \
$(wildcard ../libfat/*.c)
OBJS = crt0.o $(patsubst %.c,%.o,$(notdir $(SRCS)))
LIBOBJS = conio.o memcpy.o memset.o skipatou.o atou.o malloc.o free.o \
diff --git a/dos/syslinux.c b/dos/syslinux.c
index ab161544..3fbaee79 100644
--- a/dos/syslinux.c
+++ b/dos/syslinux.c
@@ -37,7 +37,7 @@ uint16_t dos_version;
void __attribute__((noreturn)) usage(void)
{
- puts("Usage: syslinux [-sf] <drive>: [bootsecfile]\n");
+ puts("Usage: syslinux [-sfma] <drive>: [bootsecfile]\n");
exit(1);
}
@@ -111,15 +111,27 @@ ssize_t write_file(int fd, const void *buf, size_t count)
return done;
}
+struct diskio {
+ uint32_t startsector;
+ uint16_t sectors;
+ uint16_t bufoffs, bufseg;
+} __attribute__((packed));
+
void write_device(int drive, const void *buf, size_t nsecs, unsigned int sector)
{
uint8_t err;
+ struct diskio dio;
dprintf("write_device(%d,%p,%u,%u)\n", drive, buf, nsecs, sector);
+ dio.startsector = sector;
+ dio.sectors = nsecs;
+ dio.bufoffs = (uintptr_t)buf;
+ asm("movw %%ds,%0" : "=m" (dio.bufseg));
+
asm volatile("int $0x26 ; setc %0 ; popfw"
: "=abcdm" (err)
- : "a" (drive-1), "b" (buf), "c" (nsecs), "d" (sector));
+ : "a" (drive-1), "b" (&dio), "c" (-1), "d" (buf));
if ( err )
die("sector write error");
@@ -128,17 +140,147 @@ void write_device(int drive, const void *buf, size_t nsecs, unsigned int sector)
void read_device(int drive, const void *buf, size_t nsecs, unsigned int sector)
{
uint8_t err;
+ struct diskio dio;
dprintf("read_device(%d,%p,%u,%u)\n", drive, buf, nsecs, sector);
+ dio.startsector = sector;
+ dio.sectors = nsecs;
+ dio.bufoffs = (uintptr_t)buf;
+ asm("movw %%ds,%0" : "=m" (dio.bufseg));
+
asm volatile("int $0x25 ; setc %0 ; popfw"
: "=abcdm" (err)
- : "a" (drive-1), "b" (buf), "c" (nsecs), "d" (sector));
+ : "a" (drive-1), "b" (&dio), "c" (-1), "d" (buf));
if ( err )
- die("sector write error");
+ die("sector read error");
}
+/* Both traditional DOS and FAT32 DOS return this structure, but
+ FAT32 return a lot more data, so make sure we have plenty of space */
+struct deviceparams {
+ uint8_t specfunc;
+ uint8_t devtype;
+ uint16_t devattr;
+ uint16_t cylinders;
+ uint8_t mediatype;
+ uint16_t bytespersec;
+ uint8_t secperclust;
+ uint16_t ressectors;
+ uint8_t fats;
+ uint16_t rootdirents;
+ uint16_t sectors;
+ uint8_t media;
+ uint16_t fatsecs;
+ uint16_t secpertrack;
+ uint16_t heads;
+ uint32_t hiddensecs;
+ uint32_t hugesectors;
+ uint8_t lotsofpadding[224];
+} __attribute__((packed));
+
+uint32_t get_partition_offset(int drive)
+{
+ uint8_t err;
+ uint16_t rv;
+ struct deviceparams dp;
+
+ dp.specfunc = 1; /* Get current information */
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "b" (drive), "c" (0x0860), "d" (&dp));
+
+ if ( !err )
+ return dp.hiddensecs;
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "b" (drive), "c" (0x4860), "d" (&dp));
+
+ if ( !err )
+ return dp.hiddensecs;
+
+ die("could not find partition start offset");
+}
+
+struct rwblock {
+ uint8_t special;
+ uint16_t head;
+ uint16_t cylinder;
+ uint16_t firstsector;
+ uint16_t sectors;
+ uint16_t bufferoffset;
+ uint16_t bufferseg;
+} __attribute__((packed));
+
+static struct rwblock mbr = {
+ .special = 0,
+ .head = 0,
+ .cylinder = 0,
+ .firstsector = 0, /* MS-DOS, unlike the BIOS, zero-base sectors */
+ .sectors = 1,
+ .bufferoffset = 0,
+ .bufferseg = 0
+};
+
+void write_mbr(int drive, const void *buf)
+{
+ uint16_t rv;
+ uint8_t err;
+
+ dprintf("write_mbr(%d,%p)\n", drive, buf);
+
+ mbr.bufferoffset = (uintptr_t)buf;
+ asm("movw %%ds,%0" : "=m" (mbr.bufferseg));
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "c" (0x0841), "d" (&mbr), "b" (drive));
+
+ if ( !err )
+ return;
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "c" (0x4841), "d" (&mbr), "b" (drive));
+
+ if ( err )
+ die("mbr write error");
+}
+
+void read_mbr(int drive, const void *buf)
+{
+ uint16_t rv;
+ uint8_t err;
+
+ dprintf("read_mbr(%d,%p)\n", drive, buf);
+
+ mbr.bufferoffset = (uintptr_t)buf;
+ asm("movw %%ds,%0" : "=m" (mbr.bufferseg));
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "c" (0x0861), "d" (&mbr), "b" (drive));
+
+ if ( !err )
+ return;
+
+ rv = 0x440d;
+ asm volatile("int $0x21 ; setc %0"
+ : "=abcdm" (err), "+a" (rv)
+ : "c" (0x4861), "d" (&mbr), "b" (drive));
+
+ if ( err )
+ die("mbr read error");
+}
+
/* This call can legitimately fail, and we don't care, so ignore error return */
void set_attributes(const char *file, int attributes)
{
@@ -239,6 +381,62 @@ void unlock_device(int level)
}
}
+
+/*
+ * This function does any desired MBR manipulation; called with the device lock held.
+ */
+struct mbr_entry {
+ uint8_t active; /* Active flag */
+ uint8_t bhead; /* Begin head */
+ uint8_t bsector; /* Begin sector */
+ uint8_t bcylinder; /* Begin cylinder */
+ uint8_t filesystem; /* Filesystem value */
+ uint8_t ehead; /* End head */
+ uint8_t esector; /* End sector */
+ uint8_t ecylinder; /* End cylinder */
+ uint32_t startlba; /* Start sector LBA */
+ uint32_t sectors; /* Length in sectors */
+} __attribute__((packed));
+
+static void adjust_mbr(int device, int writembr, int set_active)
+{
+ static unsigned char sectbuf[512];
+ int i;
+
+ if ( !writembr && !set_active )
+ return; /* Nothing to do */
+
+ read_mbr(device, sectbuf);
+
+ if ( writembr ) {
+ memcpy(sectbuf, syslinux_mbr, syslinux_mbr_len);
+ *(uint16_t *)(sectbuf+510) = 0xaa55;
+ }
+
+ if ( set_active ) {
+ uint32_t offset = get_partition_offset(device);
+ struct mbr_entry *me = (struct mbr_entry *)(sectbuf+446);
+ int found = 0;
+
+ for ( i = 0 ; i < 4 ; i++ ) {
+ if ( me->startlba == offset ) {
+ me->active = 0x80;
+ found++;
+ } else {
+ me->active = 0;
+ }
+ }
+
+ if ( found < 1 ) {
+ die("partition not found");
+ } else if ( found > 1 ) {
+ die("multiple aliased partitions found");
+ }
+ }
+
+ write_mbr(device, sectbuf);
+}
+
int main(int argc, char *argv[])
{
static unsigned char sectbuf[512];
@@ -253,6 +451,8 @@ int main(int argc, char *argv[])
const char *device = NULL, *bootsecfile = NULL;
const char *errmsg;
int i;
+ int writembr = 0; /* -m (write MBR) option */
+ int set_active = 0; /* -a (set partition active) option */
dprintf("argv = %p\n", argv);
for ( i = 0 ; i <= argc ; i++ )
@@ -269,11 +469,20 @@ int main(int argc, char *argv[])
usage();
while ( *opt ) {
- if ( *opt == 's' ) {
- syslinux_make_stupid(); /* Use "safe, slow and stupid" code */
- } else if ( *opt == 'f' ) {
- force = 1; /* Force install */
- } else {
+ switch ( *opt ) {
+ case 's': /* Use "safe, slow and stupid" code */
+ syslinux_make_stupid();
+ break;
+ case 'f': /* Force install */
+ force = 1;
+ break;
+ case 'm': /* Write MBR */
+ writembr = 1;
+ break;
+ case 'a': /* Set partition active */
+ set_active = 1;
+ break;
+ default:
usage();
}
opt++;
@@ -294,8 +503,8 @@ int main(int argc, char *argv[])
/*
* Figure out which drive we're talking to
*/
- dev_fd = device[0] & 0x1F;
- if ( !(device[0] & 0x40) || device[1] != ':' || device[2] )
+ dev_fd = (device[0] & ~0x20) - 0x40;
+ if ( dev_fd < 1 || dev_fd > 26 || device[1] != ':' || device[2] )
usage();
set_lock_device(dev_fd);
@@ -352,6 +561,11 @@ int main(int argc, char *argv[])
write_device(dev_fd, syslinux_ldlinux, 1, sectors[0]);
/*
+ * Muck with the MBR, if desired, while we hold the lock
+ */
+ adjust_mbr(dev_fd, writembr, set_active);
+
+ /*
* To finish up, write the boot sector
*/
diff --git a/win32/syslinux.c b/win32/syslinux.c
index 8429f785..283861b4 100644
--- a/win32/syslinux.c
+++ b/win32/syslinux.c
@@ -278,16 +278,22 @@ int main(int argc, char *argv[])
usage();
while ( *opt ) {
- if ( *opt == 's' ) {
- syslinux_make_stupid(); /* Use "safe, slow and stupid" code */
- } else if ( *opt == 'f' ) {
- force = 1; /* Force install */
- } else if ( *opt == 'm' ) {
- mbr = 1; /* Install MBR */
- } else if ( *opt == 'a' ) {
- setactive = 1; /* Mark this partition active */
- } else {
+ switch ( *opt ) {
+ case 's': /* Use "safe, slow and stupid" code */
+ syslinux_make_stupid();
+ break;
+ case 'f': /* Force install */
+ force = 1;
+ break;
+ case 'm': /* Install MBR */
+ mbr = 1;
+ break;
+ case 'a': /* Mark this partition active */
+ setactive = 1;
+ break;
+ default:
usage();
+ break;
}
opt++;
}