mkiso: new -i switch to use isolinux

diff --git a/mkiso/menu.c b/mkiso/menu.c
index 810eeb6..a027562 100644 (file)
--- a/mkiso/menu.c
+++ b/mkiso/menu.c
@@ -1,7 +1,7 @@
 /*
  *  menu.c
  *
- *  Copyright (c) 2006, 2007, 2008, 2009, 2010 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,19 +33,18 @@ extern char *fst_root;
 extern char *fst_ver;
 extern char *fst_codename;
 
-char *mkmenu(volume_t *volume)
+char *mkmenu(volume_t *volume, int isolinux)
 {
        char *flist = strdup("/tmp/mkiso_XXXXXX");
-       FILE *fp;
        char *kernel = detect_kernel(volume->arch);
-       char *ptr = g_strdup_printf("%s/boot/initrd-%s.img.gz", fst_root, volume->arch);
-       char *gptr = g_strdup_printf("%s/boot/initrd-%s-gui.img.gz", fst_root, volume->arch);
-       struct stat buf;
+       FILE *fp;
 
        mkstemp(flist);
        if(!(fp = fopen(flist, "w")))
                return(NULL);
 
+       if (!isolinux) {
+       struct stat buf;
        fprintf(fp, "default=0\n"
                "timeout=10\n");
        if(!stat("/boot/grub/message", &buf))
@@ -69,9 +68,32 @@ char *mkmenu(volume_t *volume)
        fprintf(fp, "\tinitrd /boot/initrd-%s-gui.img.gz\n",
                volume->arch);
 
+       } else {
+               fprintf(fp, "timeout 100\n");
+               fprintf(fp, "ui menu.c32\n");
+               fprintf(fp, "menu title Frugalware Linux\n\n");
+
+               fprintf(fp, "label frugalware\n");
+               fprintf(fp, "\tmenu label Frugalware %s (%s) - %s\n",
+                       fst_ver, fst_codename, kernel);
+               fprintf(fp, "\tlinux /boot/vmlinuz\n");
+               fprintf(fp, "\tinitrd /boot/initrd\n");
+
+               fprintf(fp, "label frugalwarevgafb\n");
+               fprintf(fp, "\tmenu label Frugalware %s (%s) - %s (vga fb)\n",
+                       fst_ver, fst_codename, kernel);
+               fprintf(fp, "\tlinux /boot/vmlinuz\n");
+               fprintf(fp, "\tinitrd /boot/initrd\n");
+               fprintf(fp, "\tappend vga=791\n");
+
+               fprintf(fp, "label frugalwaregui\n");
+               fprintf(fp, "\tmenu label Frugalware %s (%s) - %s (gui)\n",
+                       fst_ver, fst_codename, kernel);
+               fprintf(fp, "\tlinux /boot/vmlinuz\n");
+               fprintf(fp, "\tinitrd /boot/initrd-gui\n");
+
+       }
        fclose(fp);
-       free(ptr);
-       free(gptr);
        free(kernel);
        return(flist);
 }

diff --git a/mkiso/menu.h b/mkiso/menu.h
index 642f6ca..1404df4 100644 (file)
--- a/mkiso/menu.h
+++ b/mkiso/menu.h
@@ -1,7 +1,7 @@
 /*
  *  menu.h
  *
- *  Copyright (c) 2006, 2008 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2006, 2008, 2011 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,6 @@
  *  USA.
  */
 
-char *mkmenu(volume_t *volume);
+char *mkmenu(volume_t *volume, int isolinux);
 char *mkbootmsg(volume_t *volume);
 char *mkconf(volume_t *volume);

diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c
index 700f301..72d72e4 100644 (file)
--- a/mkiso/mkiso.c
+++ b/mkiso/mkiso.c
@@ -254,7 +254,7 @@ void isogrp_stat(FILE *fp)
        fprintf(fp, "%-16s %4dMB %4dMB\n", "total", sum, usum);
 }
 
-int mkiso(volume_t *volume, int countonly, int stable, int dryrun)
+int mkiso(volume_t *volume, int countonly, int stable, int dryrun, int isolinux)
 {
        PM_LIST *i, *sorted;
        int total=0, myvolume=1, bootsize;
@@ -282,21 +282,33 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun)
                kptr = g_strdup_printf("boot/vmlinux-%s", ptr);
        }
        free(ptr);
-       iso_add(dryrun, fp, kptr);
        iptr = g_strdup_printf("boot/initrd-%s.img.gz", volume->arch);
-       iso_add(dryrun, fp, iptr);
        giptr = g_strdup_printf("boot/initrd-%s-gui.img.gz", volume->arch);
-       iso_add(dryrun, fp, giptr);
+       if (!isolinux) {
+               iso_add(dryrun, fp, kptr);
+               iso_add(dryrun, fp, iptr);
+               iso_add(dryrun, fp, giptr);
+       } else {
+               fprintf(fp, "boot/vmlinuz=%s\n", kptr);
+               fprintf(fp, "boot/initrd=%s\n", iptr);
+               fprintf(fp, "boot/initrd-gui=%s\n", giptr);
+       }
        // how many space is needed for the kernel & initrd?
        bootsize = boot_size(fst_root, kptr, iptr, giptr);
        free(kptr);
        free(iptr);
        free(giptr);
        if (!strcmp(volume->arch, "i686") || !strcmp(volume->arch, "x86_64")) {
-               menu = mkmenu(volume);
-               iso_add(dryrun, fp, "boot/grub/message");
-               iso_add(dryrun, fp, "boot/grub/stage2_eltorito");
-               fprintf(fp, "boot/grub/menu.lst=%s\n", menu);
+               menu = mkmenu(volume, isolinux);
+               if (!isolinux) {
+                       iso_add(dryrun, fp, "boot/grub/message");
+                       iso_add(dryrun, fp, "boot/grub/stage2_eltorito");
+                       fprintf(fp, "boot/grub/menu.lst=%s\n", menu);
+               } else {
+                       iso_add(dryrun, fp, "boot/syslinux/isolinux.bin");
+                       iso_add(dryrun, fp, "boot/syslinux/menu.c32");
+                       fprintf(fp, "boot/syslinux/syslinux.cfg=%s\n", menu);
+               }
        } else if (!strcmp(volume->arch, "ppc")) {
                bootmsg = mkbootmsg(volume);
                conf = mkconf(volume);
@@ -352,9 +364,10 @@ int mkiso(volume_t *volume, int countonly, int stable, int dryrun)
                                "-graft-points "
                                "-path-list %s "
                                "-hide-rr-moved "
-                               "-b boot/grub/stage2_eltorito "
+                               "-b %s "
                                "-v -d -N -no-emul-boot -boot-load-size 4 -boot-info-table",
-                               fname, label, flist);
+                               fname, label, flist,
+                               (!isolinux ? "boot/grub/stage2_eltorito" : "boot/syslinux/isolinux.bin"));
        } else if (!strcmp(volume->arch, "ppc")) {
                cmdline = g_strdup_printf("mkhybrid -o %s "
                                "-r -hfs-unlock -part -hfs -map ./boot/yaboot/maps "
@@ -474,7 +487,7 @@ int rmrf(char *path)
        return(0);
 }
 
-int prepare(volume_t *volume, char *tmproot, int countonly, int stable, int dryrun, char *group)
+int prepare(volume_t *volume, char *tmproot, int countonly, int stable, int dryrun, char *group, int isolinux)
 {
        PM_LIST *i, *junk;
        PM_DB *db_local, *db_sync;
@@ -542,7 +555,7 @@ int prepare(volume_t *volume, char *tmproot, int countonly, int stable, int dryr
        }
        PRINTF(" done.\n");
 
-       mkiso(volume, countonly, stable, dryrun);
+       mkiso(volume, countonly, stable, dryrun, isolinux);
        pacman_trans_release();
        pacman_release();
        g_list_free(isopkgs);
@@ -557,7 +570,7 @@ int main(int argc, char **argv)
        char tmproot[] = "/tmp/mkiso_XXXXXX";
        char *xmlfile = strdup("volumes.xml");
        char *group = NULL;
-       int i, countonly=0, stable=0, dryrun=0;
+       int i, countonly=0, stable=0, dryrun=0, isolinux=0;
        char *ptr;
        int opt;
        int option_index;
@@ -569,12 +582,13 @@ int main(int argc, char **argv)
                {"stable",      no_argument,       0, 's'},
                {"file",        required_argument, 0, 'f'},
                {"group",       required_argument, 0, 'g'},
+               {"isolinux",    no_argument,       0, 'i'},
                {0, 0, 0, 0}
        };
 
        if(argc >= 2)
        {
-               while((opt = getopt_long(argc, argv, "hcsf:g:n", opts, &option_index)))
+               while((opt = getopt_long(argc, argv, "hcsf:g:ni", opts, &option_index)))
                {
                        if(opt < 0)
                                break;
@@ -588,6 +602,7 @@ int main(int argc, char **argv)
                                        printf("       -n | --dry-run do not generate an iso, just print a filelist\n");
                                        printf("       -s | --stable  indicate that the source repo is a -stable one\n");
                                        printf("       -g | --group   include packages from a single group only\n");
+                                       printf("       -i | --isolinux use isolinux instead of grub (on x86)\n");
                                        free(xmlfile);
                                        return(0);
                                break;
@@ -600,6 +615,8 @@ int main(int argc, char **argv)
                                break;
                                case 'g':
                                        group = strdup(optarg);
+                               case 'i': isolinux=1; break;
+                               default:
                                break;
                        }
                }
@@ -619,7 +636,7 @@ int main(int argc, char **argv)
        free(ptr);
 
        for(i=0;i<g_list_length(volumes);i++)
-               if(prepare(g_list_nth_data(volumes, i), tmproot, countonly, stable, dryrun, group))
+               if(prepare(g_list_nth_data(volumes, i), tmproot, countonly, stable, dryrun, group, isolinux))
                        break;
 
        PRINTF("cleaning up...");