From 18f005c3a0bce5ce54d83a80134a0ceaa1a79dfb Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 31 Aug 2007 22:34:39 +0000 Subject: [PATCH] don't check if a file is gzipped (cannot manage correctly ramdisk), add "vga default" parameter --- libemile/emile_floppy_create_image.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/libemile/emile_floppy_create_image.c b/libemile/emile_floppy_create_image.c index 0f99f8e..023b5e4 100644 --- a/libemile/emile_floppy_create_image.c +++ b/libemile/emile_floppy_create_image.c @@ -150,23 +150,6 @@ int emile_floppy_create(char *image, char* first_level, char* second_level) return fd; } -static int is_gzipped(char *name) -{ - int fd; - unsigned char magic[2]; - - magic[0] = magic[1] = 0; - - fd = open(name, O_RDONLY); - if (fd == -1) - return 0; - - read(fd, magic, 2); - close(fd); - - return (magic[0] == 0x1f) && (magic[1] == 0x8b); -} - char* emile_floppy_add(int fd, char *image) { off_t offset; @@ -183,10 +166,7 @@ char* emile_floppy_add(int fd, char *image) if (size == -1) return NULL; - if (is_gzipped(image)) - sprintf(buf, "block:(fd0)0x%lx", offset); - else - sprintf(buf, "block:(fd0)0x%lx,0x%zx", offset, size); + sprintf(buf, "block:(fd0)0x%lx,0x%zx", offset, size); return strdup(buf); } @@ -242,7 +222,7 @@ int emile_floppy_create_image(char* first_level, char* second_level, /* set second level info */ - ret = emile_second_set_param(fd, kernel_url, "", ramdisk_url); + ret = emile_second_set_param(fd, kernel_url, "vga default", ramdisk_url); emile_floppy_close(fd);