Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-11 12:29:30 +00:00
Code Issues Projects Releases Wiki Activity

replace emile-set-startup by emile-map-set

Browse Source
This commit is contained in:
Laurent Vivier 2004-12-27 21:39:19 +00:00
parent c43e184cff
commit f21fd88ead
12 changed files with 425 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,12 +1,25 @@
24 Dev 2004 - Laurent Vivier <LaurentVivier@wanadoo.fr>
* gestalt ID modification feature
* SCSI boot support
* can boot with a non-compressed kernel (for small memory and slow
cpu)
* correct a major memory usage error (second level)
* move all EMILE base functions to libemile
* minor enhancement (use getopt())
* Release 0.7
18 Aug 2004 - Laurent Vivier <LaurentVivier@wanadoo.fr>
* if needed, modify PRAM to boot in 32bit mode.
* Release 0.6
12 July 2004 - Laurent Vivier <LaurentVivier@wanadoo.fr>
* Macintosh SE/30 support
* serial line console support
* fragmented memory support
* Release 0.5
09 June 2004 - Laurent Vivier <LaurentVivier@wanadoo.fr>
@ -20,6 +33,7 @@
* separated images for second stage, kernel and ramdisk
* add tools to manage floppy image
* my build environment is now Debian Sid PPC
* Release 0.4
11 May 2004 - Laurent Vivier <LaurentVivier@wanadoo.fr>

6
Makefile
View File

@ -100,7 +100,7 @@ install: all
install tools/emile-install $(DESTDIR)/$(PREFIX)/sbin/emile-install
install tools/emile-set-output $(DESTDIR)/$(PREFIX)/sbin/emile-set-output
install tools/emile $(DESTDIR)/$(PREFIX)/sbin/emile
install tools/emile-set-startup $(DESTDIR)/$(PREFIX)/sbin/emile-set-startup
install tools/emile-map-set $(DESTDIR)/$(PREFIX)/sbin/emile-map-set
install -d $(DESTDIR)/$(PREFIX)/boot/emile/
install first/first_scsi $(DESTDIR)/$(PREFIX)/boot/emile/first_scsi
install -d $(DESTDIR)/$(PREFIX)/lib/emile/
@ -118,7 +118,7 @@ uninstall:
rm -fr $(DESTDIR)/$(PREFIX)/sbin/emile-install
rm -fr $(DESTDIR)/$(PREFIX)/sbin/emile-set-output
rm -fr $(DESTDIR)/$(PREFIX)/sbin/emile
rm -fr $(DESTDIR)/$(PREFIX)/sbin/emile-set-startup
rm -fr $(DESTDIR)/$(PREFIX)/sbin/emile-map-set
rm -f $(DESTDIR)/$(PREFIX)/boot/emile/first_scsi
rm -f $(DESTDIR)/$(PREFIX)/lib/emile/first_floppy
rm -f $(DESTDIR)/$(PREFIX)/boot/emile/second_scsi
@ -154,7 +154,7 @@ TOOLS_FILES = tools/emile-set-cmdline.c tools/Makefile \
tools/emile-first-tune.c \
tools/emile-second.h tools/emile-install.c \
tools/emile-set-output.c tools/emile.c tools/emile_scanbus.c \
tools/emile-set-startup.c
tools/emile-map-set.c
LIB_FILES = libemile/bootblock.h libemile/emile_first_get_param.c \
libemile/Makefile libemile/emile_first_set_param.c \

1
libemile/emile_map_set_startup.c
View File

@ -47,6 +47,7 @@ int emile_map_set_startup(char* dev_name, int partition)
part_type = emile_map_get_partition_type(map);
if (strcmp(part_type, APPLE_HFS) == 0)
{
emile_map_partition_set_bootable(map, i == partition);
emile_map_partition_set_startup(map, i == partition);
ret = emile_map_write(map, i);
if (ret == -1)

6
libemile/emile_scsi_create_container.c
View File

@ -50,10 +50,14 @@ static int get_device_info(int fd, int *id, unsigned long *first_block,
unsigned char channel;
unsigned char pun;
unsigned char lun;
char *driver;
int disk;
int partition;
ret = emile_scsi_get_dev(dev_name, fd);
ret = emile_scsi_get_dev(fd, &driver, &disk, &partition);
if (ret == -1)
return -1;
sprintf(dev_name, "%s%c%d", driver, disk + 'a', partition);
fd = open(dev_name, O_RDONLY);
if (fd == -1) {

12
libemile/emile_scsi_get_dev.c
View File

@ -12,9 +12,12 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$";
#include "libemile.h"
#define MAJOR_SD 8 /* SCSI disks */
/* SCSI disks */
int emile_scsi_get_dev(char* dev_name, int fd)
#define MAJOR_SD 8
static char *scsi_base = "/dev/sd";
int emile_scsi_get_dev(int fd, char** driver, int *disk, int *partition)
{
struct stat st;
int ret;
@ -34,8 +37,9 @@ int emile_scsi_get_dev(char* dev_name, int fd)
switch(major)
{
case MAJOR_SD: /* SCSI disks */
sprintf(dev_name, "/dev/sd%c%d", 'a' + (minor >> 4),
minor & 0x0F);
*driver = scsi_base;
*disk = minor >> 4;
*partition = minor & 0x0F;
break;
default:
fprintf(stderr, "Unknown device major number %d\n", major);

4
libemile/emile_scsi_get_rdev.c
View File

@ -9,8 +9,9 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$";
#include "libemile.h"
#define MAJOR_SD 8
static char *scsi_base = "/dev/sd";
int emile_scsi_get_rdev(char* dev_name, int *disk, int *partition)
int emile_scsi_get_rdev(char* dev_name, char** driver, int *disk, int *partition)
{
int ret;
struct stat st;
@ -28,6 +29,7 @@ int emile_scsi_get_rdev(char* dev_name, int *disk, int *partition)
if (major != MAJOR_SD)
return -1;
*driver = scsi_base;
*disk = (st.st_rdev & 0xFF) >> 4;
*partition = st.st_rdev & 0x0F;

4
libemile/libemile.h
View File

@ -124,9 +124,9 @@ extern int emile_map_bootblock_read(emile_map_t* map, char* bootblock);
extern int emile_map_bootblock_write(emile_map_t* map, char* bootblock);
extern int emile_map_bootblock_get_type(char* bootblock);
extern int emile_map_bootblock_is_valid(char *bootblock);
extern int emile_scsi_get_dev(char *dev_name, int fd);
extern int emile_scsi_get_dev(int fd, char** driver, int *disk, int *partition);
extern int emile_map_set_startup(char* dev_name, int partition);
extern int emile_scsi_get_rdev(char* dev_name, int *disk, int *partition);
extern int emile_scsi_get_rdev(char* dev_name, char** driver, int *disk, int *partition);
extern int emile_map_has_apple_driver(emile_map_t *map);
extern int emile_map_seek_driver_partition(emile_map_t *map, int start);
extern int emile_get_uncompressed_size(char *file);

2
second/container.S
View File

@ -4,7 +4,7 @@
*
*/
#define SCSI_MAX_BLOCKS 128
#define SCSI_MAX_BLOCKS 511
.section .rodata

2
tools/Makefile
View File

@ -5,7 +5,7 @@
#
PROGRAMS = emile-set-cmdline emile-first-tune emile-install \
emile-set-output emile emile-set-startup
emile-set-output emile emile-map-set
CPPFLAGS = -DSIGNATURE="\"$(SIGNATURE)\"" -DPREFIX=\"$(PREFIX)\" -I../libemile
CFLAGS = -Wall -g

150
tools/emile-map-set.c Normal file
View File

@ -0,0 +1,150 @@
/*
*
* (c) 2004 Laurent Vivier <LaurentVivier@wanadoo.fr>
*
*/
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <getopt.h>
#include "libemile.h"
enum {
ACTION_NONE = 0x00,
ACTION_FLAGS = 0x01,
ACTION_TYPE = 0x02,
ACTION_STARTUP = 0x04,
};
enum {
ARG_NONE = 0,
ARG_HELP = 'h',
ARG_FLAGS = 'f',
ARG_TYPE ='t',
ARG_STARTUP ='s',
};
static struct option long_options[] =
{
{"help", 0, NULL, ARG_HELP },
{"flags", 1, NULL, ARG_FLAGS },
{"type", 1, NULL, ARG_TYPE },
{"startup", 0, NULL, ARG_STARTUP },
{NULL, 0, NULL, 0 },
};
static void usage(int argc, char** argv)
{
fprintf(stderr, "Usage: %s [--startup|--flags FLAGS][--type TYPE] <partition>\n", argv[0]);
fprintf(stderr, "\nbuild: \n%s\n", SIGNATURE);
}
int main(int argc, char** argv)
{
emile_map_t *map;
int ret;
int disk;
int partition;
char disk_name[16];
char *driver;
int action = ACTION_NONE;
char *dev_name = NULL;
int c;
int option_index;
int flags;
char *type;
while(1)
{
c = getopt_long(argc, argv, "hsf:t:", long_options,
&option_index);
if (c == -1)
break;
switch(c)
{
case ARG_HELP:
usage(argc, argv);
return 0;
case ARG_FLAGS:
action |= ACTION_FLAGS;
flags = atoi(optarg);
break;
case ARG_TYPE:
action |= ACTION_TYPE;
type = optarg;
break;
case ARG_STARTUP:
action |= ACTION_STARTUP;
break;
}
}
if (optind < argc)
dev_name = argv[optind];
if (dev_name == NULL)
{
fprintf(stderr, "ERROR: you must specify a device\n");
return 1;
}
ret = emile_scsi_get_rdev(dev_name, &driver, &disk, &partition);
if (ret == -1)
{
fprintf(stderr, "ERROR: cannot find disk of %s\n", dev_name);
return 1;
}
sprintf(disk_name, "%s%c", driver, 'a' + disk);
if (action & ACTION_STARTUP)
{
if (action & ~ACTION_STARTUP)
{
fprintf(stderr,
"ERROR: don't use --startup with other flags\n");
return 2;
}
ret = emile_map_set_startup(disk_name, partition - 1);
if (ret == -1) {
fprintf(stderr, "ERROR: cannot set startup partition\n");
return 3;
}
}
map = emile_map_open(disk_name, O_RDWR);
if (map == NULL)
{
fprintf(stderr, "ERROR: cannot open partition map\n");
return 4;
}
ret = emile_map_read(map, partition - 1);
if (ret != partition - 1)
{
fprintf(stderr,
"ERROR: cannot read partition %d info\n", partition);
return 5;
}
printf("flags %d (%x) type %s\n", flags, flags, type);
#if 0
emile_map_set_flags(map, flags);
emile_map_set_partition_type(map, type);
ret = emile_map_write(map, partition - 1);
if (ret != partition - 1)
{
fprintf(stderr,
"ERROR: cannot write partition %d info\n", partition);
return 5;
}
#endif
emile_map_close(map);
return 0;
}

338
tools/emile.c
View File

@ -28,11 +28,26 @@ static char *partition = NULL;
static char *append_string = NULL;
static int buffer_size = 0;
enum {
ACTION_NONE = 0x00000000,
ACTION_SCANBUS = 0x00000001,
ACTION_SET_HFS = 0x00000002,
ACTION_RESTORE = 0x00000004,
ACTION_BACKUP = 0x00000008,
ACTION_SET_BUFFER = 0x00000010,
ACTION_TEST = 0x00000020,
ACTION_FIRST = 0x00000040,
ACTION_SECOND = 0x00000080,
ACTION_KERNEL = 0x00000100,
ACTION_PARTITION = 0x00000200,
ACTION_APPEND = 0x00000400,
};
enum {
ARG_NONE = 0,
ARG_SCANBUS,
ARG_SET_HFS,
ARG_SET_STARTUP,
ARG_RESTORE,
ARG_BACKUP,
ARG_APPEND = 'a',
ARG_VERBOSE ='v',
@ -56,7 +71,7 @@ static struct option long_options[] =
{"help", 0, NULL, ARG_HELP },
{"scanbus", 0, NULL, ARG_SCANBUS },
{"set-hfs", 0, NULL, ARG_SET_HFS },
{"set-startup", 0, NULL, ARG_SET_STARTUP },
{"restore", 2, NULL, ARG_RESTORE },
{"backup", 2, NULL, ARG_BACKUP },
{"test", 0, NULL, ARG_TEST },
{"append", 0, NULL, ARG_APPEND },
@ -77,9 +92,9 @@ static void usage(int argc, char** argv)
fprintf(stderr," -k, --kernel PATH set path of kernel\n");
fprintf(stderr," -a, --append ARG set kernel command line\n");
fprintf(stderr," -p, --partition DEV define device where to install boot block\n");
fprintf(stderr," --restore[=FILE] save current boot block from FILE\n");
fprintf(stderr," --backup[=FILE] save current boot block to FILE\n");
fprintf(stderr," --set-hfs set type of partition DEV to Apple_HFS (needed to be bootable)\n");
fprintf(stderr," --set-startup set partition DEV to be the startup partition\n");
fprintf(stderr, "\nUse \"--test\" to see default values\n");
fprintf(stderr, "!!! USE WITH CAUTION AND AT YOUR OWN RISK !!!\n");
@ -92,12 +107,13 @@ static int open_map_of( char *dev_name, int flags,
int ret;
int disk;
char disk_name[16];
char *driver;
ret = emile_scsi_get_rdev(dev_name, &disk, partition);
ret = emile_scsi_get_rdev(dev_name, &driver, &disk, partition);
if (ret == -1)
return -1;
sprintf(disk_name, "/dev/sd%c", 'a' + disk);
sprintf(disk_name, "%s%c", driver, 'a' + disk);
*map = emile_map_open(disk_name, flags);
@ -170,27 +186,6 @@ static int check_is_EMILE_bootblock(char *dev_name)
return EMILE_BOOTBLOCK == bootblock_type;
}
static int check_is_startup(char *dev_name)
{
emile_map_t *map;
int ret;
int partition;
ret = open_map_of(dev_name, O_RDONLY, &map, &partition);
if (ret == -1)
return -1;
ret = emile_map_read(map, partition - 1);
if (ret == -1)
return -1;
ret = emile_map_partition_is_startup(map);
emile_map_close(map);
return ret;
}
static int backup_bootblock(char *dev_name, char *filename)
{
emile_map_t *map;
@ -235,6 +230,51 @@ static int backup_bootblock(char *dev_name, char *filename)
return 0;
}
static int restore_bootblock(char *dev_name, char *filename)
{
emile_map_t *map;
int ret;
int partition;
char bootblock[BOOTBLOCK_SIZE];
int fd;
if (!check_is_EMILE_bootblock(dev_name))
{
fprintf(stderr, "ERROR: cannot restore bootblock over non-EMILE bootblock\n");
return -1;
}
/* read bootblock */
fd = open(filename, O_RDONLY);
if (fd == -1)
return -1;
ret = read(fd, bootblock, BOOTBLOCK_SIZE);
if (ret != BOOTBLOCK_SIZE)
return -1;
close(fd);
/* write bootblock */
ret = open_map_of(dev_name, O_WRONLY, &map, &partition);
if (ret == -1)
return -1;
ret = emile_map_read(map, partition - 1);
if (ret == -1)
return -1;
ret = emile_map_bootblock_write(map, bootblock);
if (ret == -1)
return -1;
emile_map_close(map);
return 0;
}
static int copy_file_to_bootblock(char* first_path, char* dev_name)
{
emile_map_t *map;
@ -305,40 +345,15 @@ static int set_HFS(char *dev_name)
return 0;
}
static int set_startup(char *dev_name)
{
int ret;
int partition;
int disk;
char disk_name[16];
ret = emile_scsi_get_rdev(dev_name, &disk, &partition);
if (ret == -1)
return -1;
sprintf(disk_name, "/dev/sd%c", 'a' + disk);
ret = emile_map_set_startup(disk_name, partition - 1);
if (ret == -1)
return -1;
return 0;
}
int main(int argc, char **argv)
{
int ret;
int c;
int option_index = 0;
int action_scanbus = 0;
int action_set_hfs = 0;
int action_set_startup = 0;
int action_backup = 0;
int action_set_buffer = 0;
int action_test = 0;
char tmp_partition[16];
char tmp_append[512];
int fd;
int action = ACTION_NONE;
while(1)
{
@ -347,49 +362,58 @@ int main(int argc, char **argv)
break;
switch(c)
{
case ARG_SCANBUS:
action_scanbus = 1;
break;
case ARG_VERBOSE:
verbose++;
break;
case ARG_HELP:
usage(argc, argv);
return 0;
case ARG_SCANBUS:
action |= ACTION_SCANBUS;
break;
case ARG_FIRST:
action |= ACTION_FIRST;
first_path = optarg;
break;
case ARG_SECOND:
action |= ACTION_SECOND;
second_path = optarg;
break;
case ARG_KERNEL:
action |= ACTION_KERNEL;
kernel_path = optarg;
break;
case ARG_BUFFER:
action_set_buffer = 1;
action |= ACTION_SET_BUFFER;
buffer_size = atoi(optarg);
break;
case ARG_PARTITION:
action |= ACTION_PARTITION;
partition = optarg;
break;
case ARG_SET_HFS:
action_set_hfs = 1;
action |= ACTION_SET_HFS;
break;
case ARG_SET_STARTUP:
action_set_startup = 1;
case ARG_RESTORE:
action |= ACTION_RESTORE;
if (optarg != NULL)
backup_path = optarg;
else
backup_path = PREFIX "/boot/emile/bootblock.backup";
break;
case ARG_BACKUP:
action_backup = 1;
action |= ACTION_BACKUP;
if (optarg != NULL)
backup_path = optarg;
else
backup_path = PREFIX "/boot/emile/bootblock.backup";
break;
case ARG_APPEND:
action |= ACTION_APPEND;
append_string = optarg;
break;
case ARG_TEST:
action_test = 1;
action |= ACTION_TEST;
break;
default:
fprintf(stderr, "ERROR: unknown option %s (%d, %c)\n",
@ -398,11 +422,11 @@ int main(int argc, char **argv)
}
}
if (action_scanbus) {
if (action & ACTION_SCANBUS) {
if (action_test) {
if (action & ~ACTION_SCANBUS) {
fprintf(stderr,
"ERROR: \"--scanbus\" cannot be used with \"--test\"\n");
"ERROR: \"--scanbus\" cannot be used with other arguments\n");
return 1;
}
@ -410,15 +434,85 @@ int main(int argc, char **argv)
return 0;
}
/* seek first HFS partition */
if (partition == NULL)
{
int fd;
char dev_name[16];
emile_map_t* map;
char *part_type;
int i;
char *driver;
int disk;
int partnb;
fd = open(second_path, O_RDONLY);
if (fd == -1)
{
fprintf(stderr, "ERROR: cannot open \"%s\"\n",
second_path);
return 2;
}
ret = emile_scsi_get_dev(fd, &driver, &disk, &partnb);
if (ret == -1)
{
fprintf(stderr,"ERROR: cannot find device of \"%s\"\n",
second_path);
return 2;
}
close(fd);
sprintf(dev_name, "%s%c%d", driver, disk + 'a', partnb);
/* ROM boots on the first HFS partition it finds */
map = emile_map_open(dev_name, O_RDONLY);
if (map == NULL)
{
fprintf(stderr, "ERROR: cannot open partition map\n");
return 2;
}
for (i = 0; i < emile_map_get_number(map); i++)
{
ret = emile_map_read(map, i);
if (ret == -1)
break;
part_type = emile_map_get_partition_type(map);
if (strcmp(part_type, "Apple_HFS") == 0)
{
sprintf(tmp_partition, "%s%d", dev_name, i + 1);
partition = tmp_partition;
break;
}
}
emile_map_close(map);
}
/* if there is no HFS partition, we'll use the partition
* where there is second_scsi (/boot or /)
*/
if (partition == NULL)
{
int fd;
char *driver;
int disk;
int partnb;
fd = open(second_path, O_RDONLY);
if (fd == -1)
return 2;
ret = emile_scsi_get_dev(tmp_partition, fd);
if (ret != -1)
ret = emile_scsi_get_dev(fd, &driver, &disk, &partnb);
if (ret == 0)
{
sprintf(tmp_partition,
"%s%c%d", driver, disk + 'a', partnb);
partition = tmp_partition;
}
close(fd);
}
@ -431,9 +525,52 @@ int main(int argc, char **argv)
return 3;
}
if (action & ACTION_RESTORE)
{
if (action & (ACTION_RESTORE | ACTION_PARTITION))
{
fprintf(stderr,
"ERROR: \"--restore\" cannot be used with other arguments\n");
return 13;
}
ret = restore_bootblock(partition, backup_path);
if (ret == -1)
{
fprintf(stderr,
"ERROR: cannot restore bootblock %s from %s\n",
partition, backup_path);
return 14;
}
printf("Bootblock restore successfully done.\n");
return 0;
}
if (append_string == NULL)
{
sprintf(tmp_append, "root=%s", partition);
char *driver;
int disk;
int partnb;
fd = open(second_path, O_RDONLY);
if (fd == -1)
{
fprintf(stderr, "ERROR: cannot open \"%s\"\n",
second_path);
return 2;
}
ret = emile_scsi_get_dev(fd, &driver, &disk, &partnb);
if (ret == -1)
{
fprintf(stderr,"ERROR: cannot find device of \"%s\"\n",
second_path);
return 2;
}
close(fd);
sprintf(tmp_append, "root=%s%c%d", driver, disk + 'a', partnb);
append_string = tmp_append;
}
@ -442,7 +579,7 @@ int main(int argc, char **argv)
{
fprintf(stderr, "ERROR: cannot check if Apple_Driver exists\n");
fprintf(stderr, " you should try as root\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 4;
}
if (ret == 0)
@ -453,7 +590,7 @@ int main(int argc, char **argv)
" You must partition this disk with Apple Disk utility\n");
fprintf(stderr,
" or wait a release of EMILE allowing you to add this driver\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 5;
}
@ -463,16 +600,16 @@ int main(int argc, char **argv)
fprintf(stderr,
"ERROR: cannot check if partition is Apple_HFS\n");
fprintf(stderr, " you should try as root\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 6;
}
if ( (ret == 0) && (action_set_hfs == 0) )
if ( (ret == 0) && (action & ACTION_SET_HFS) )
{
fprintf(stderr,
"ERROR: to be bootable a partition must be of type Apple_HFS\n");
fprintf(stderr,
" you can change it to Apple_HFS using \"--set-hfs\" argument\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 7;
}
@ -481,41 +618,20 @@ int main(int argc, char **argv)
{
fprintf(stderr, "ERROR: cannot check bootblock type\n");
fprintf(stderr, " you should try as root\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 8;
}
if ( (ret == 0) && (action_backup == 0) )
if ( (ret == 0) && (action & ACTION_BACKUP) )
{
fprintf(stderr,
"ERROR: there is already a bootblock on \"%s\"\n", partition);
fprintf(stderr,
" you must use \"--backup\" to save it\n");
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 9;
}
ret = check_is_startup(partition);
if (ret == -1)
{
fprintf(stderr,
"ERROR: cannot check if it is startup partition\n");
fprintf(stderr, " you should try as root\n");
if (action_test == 0)
return 10;
}
if ( (ret == 0) && (action_set_startup == 0) )
{
fprintf(stderr,
"ERROR: \"%s\" is not the startup partition, \n", partition);
fprintf(stderr,
" you must use \"--set-startup\" to set it,\n");
fprintf(stderr,
" you can use later \"emile-set-startup\" to change it\n");
if (action_test == 0)
return 11;
}
if (action_set_buffer == 0)
if ((action & ACTION_SET_BUFFER) == 0)
{
buffer_size = emile_get_uncompressed_size(kernel_path);
if (buffer_size == -1)
@ -526,14 +642,14 @@ int main(int argc, char **argv)
" use \"--buffer <size>\" to set it or set path of gzip in PATH\n");
fprintf(stderr,
" or check \"%s\" can be read\n", kernel_path);
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
return 12;
}
}
if (action_backup)
if (action & ACTION_BACKUP)
{
if (action_test)
if (action & ACTION_TEST)
{
fprintf(stderr,
"ERROR: \"--backup\" cannot be used with \"--test\"\n");
@ -568,7 +684,7 @@ int main(int argc, char **argv)
return 15;
}
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
{
/* set kernel info */
@ -617,7 +733,7 @@ int main(int argc, char **argv)
return 19;
}
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
{
ret = emile_first_set_param_scsi(fd, second_path);
if (ret == -1)
@ -631,7 +747,7 @@ int main(int argc, char **argv)
close(fd);
if (action_test == 0)
if ((action & ACTION_TEST) == 0)
{
/* copy first level to boot block */
@ -648,7 +764,7 @@ int main(int argc, char **argv)
/* set HFS if needed */
if (action_set_hfs)
if (action & ACTION_SET_HFS)
{
ret = set_HFS(partition);
if (ret == -1)
@ -659,20 +775,6 @@ int main(int argc, char **argv)
return 22;
}
}
/* set startup if needed */
if (action_set_startup)
{
ret = set_startup(partition);
if (ret == -1)
{
fprintf( stderr,
"ERROR: cannot set startup partition to \"%s\".\n"
, partition);
return 22;
}
}
}
return 0;

36
tools/emile_scanbus.c
View File

@ -78,6 +78,7 @@ void scanbus(void)
int count;
int i;
int j;
int boottype;
char bootblock[BOOTBLOCK_SIZE];
count = emile_scanbus(devices);
@ -150,27 +151,24 @@ void scanbus(void)
printf("%16s [%-16s] ",
emile_map_get_partition_name(map),
emile_map_get_partition_type(map));
if (emile_map_partition_is_bootable(map))
emile_map_bootblock_read(map, bootblock);
boottype = emile_map_bootblock_get_type(bootblock);
switch(boottype)
{
int boottype;
emile_map_bootblock_read(map, bootblock);
boottype = emile_map_bootblock_get_type(bootblock);
switch(boottype)
{
case INVALID_BOOTBLOCK:
printf(" <no bootblock>\n");
break;
case APPLE_BOOTBLOCK:
printf(" <Apple bootblock>\n");
break;
case EMILE_BOOTBLOCK:
printf(" <EMILE bootblock>\n");
break;
default:
printf(" <unknown bootblock>\n");
break;
}
case INVALID_BOOTBLOCK:
break;
case APPLE_BOOTBLOCK:
printf(" <Apple bootblock>\n");
break;
case EMILE_BOOTBLOCK:
printf(" <EMILE bootblock>\n");
break;
default:
printf(" <unknown bootblock>\n");
break;
}
if (emile_map_partition_is_bootable(map))
printf(" *\n");
else
putchar('\n');
if (verbose)