search for: kernel_nam

* Richard W.M. Jones: > On Sat, Apr 26, 2014 at 02:27:07PM +0200, Hilko Bengen wrote: >> --- >> src/kernel.ml | 43 ++++++++++++++++++++++++++++--------------- >> 1 file changed, 28 insertions(+), 15 deletions(-) >> >> diff --git a/src/kernel.ml b/src/kernel.ml >> index ed5aea3..436b1b0 100644 >> --- a/src/kernel.ml >> +++ b/src/kernel.ml

This patch series fixes several problems in the way that supermin handles kernels. The most pressing problem is that supermin doesn't handle bogus vmlinuz files which aren't actual kernels. Along the way there is a lot of clean up. The patches look much better if you view them with ‘-w’. This series will require plenty of time to be tested in Fedora, especially on non-x86 arches.

...| _ when String.sub host_cpu 0 5 = "armv7" -> ["armmp"] + | _ -> [host_cpu] + in + List.map (fun model -> sprintf "vmlinu?-*-%s" model) models + let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = (* Locate the kernel. *) let kernel_name, kernel_version = @@ -59,9 +72,6 @@ and find_kernel debug host_cpu copy_kernel kernel = let kernel_name = Filename.basename kernel_env in kernel_env, kernel_name, kernel_version with Not_found -> - let is_x86 = - String.length host_cpu = 4 && - host...

...ertions(+), 45 deletions(-) diff --git a/src/kernel.ml b/src/kernel.ml index 9b0e8a2..2e061d8 100644 --- a/src/kernel.ml +++ b/src/kernel.ml @@ -40,28 +40,7 @@ let patt_of_cpu host_cpu = let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = (* Locate the kernel. *) - let kernel_name, kernel_version = - find_kernel debug host_cpu copy_kernel kernel in - - (* If the user passed --dtb option, locate dtb. *) - (match dtb_wildcard with - | None -> () - | Some wildcard -> - find_dtb debug copy_kernel kernel_name wildcard dtb - ); - - (* Get the kernel modules. *)...

Hi Rich But there is no src/kernel.ml file on my ubuntu powerpc to which the above patch is reffering. I have installed supermin as supermin_5.1.8-2_powerpc.deb debian package. Thanks On Tue, Jun 3, 2014 at 7:16 PM, Richard W.M. Jones <rjones@redhat.com> wrote: > On Tue, Jun 03, 2014 at 06:55:49PM +0530, abhishek jain wrote: > > supermin: failed to find a suitable kernel

...= > "armv7" -> ["armmp"] > | _ -> [host_cpu] > in > List.map (fun model -> sprintf "vmlinu?-*-%s" model) models > > let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = > (* Locate the kernel. *) > let kernel_name, kernel_version = > find_kernel debug host_cpu copy_kernel kernel in > > (* If the user passed --dtb option, locate dtb. *) > (match dtb_wildcard with > | None -> () > | Some wildcard -> > find_dtb debug copy_kernel kernel_name wildcard dtb > ); >...

...nel.ml @@ -93,12 +93,16 @@ and find_kernel_from_lib_modules debug = let files = glob "/lib/modules/*/vmlinuz" [GLOB_NOSORT; GLOB_NOESCAPE] in let files = Array.to_list files in let kernels = - List.map ( + filter_map ( fun kernel_file -> - let kernel_name = Filename.basename kernel_file in - let modpath = Filename.dirname kernel_file in - let kernel_version = Filename.basename modpath in - kernel_file, kernel_name, kernel_version, modpath + let size = try (stat kernel_file).st_size with Unix_error _ -> 0 in +...

...."); + i += 5; + } +} + +void linux_done_progress_cb(const char* file, size_t cur, size_t total) { + int percent = (int)(((float)cur / (float)total) * 100.0); + if (percent >= 100) + printf(" OK\n"); +} + int main(int argc, char *argv[]) { const char *kernel_name; @@ -118,11 +145,13 @@ int main(int argc, char *argv[]) size_t kernel_len; bool opt_dhcpinfo = false; bool opt_quiet = false; + bool opt_percent = false; void *dhcpdata; size_t dhcplen; char **argp, *arg, *p; - openconsole(&dev_null_r, &dev_stdcon_w);...

....esi.w[0] = OFFS(kernel); - ireg.ds = SEG(kernel); - ireg.ebx.w[0] = OFFS(args); - ireg.es = SEG(args); - ireg.edx.l = type - KT_KERNEL; - /* ireg.ecx.l = 0; *//* We do ipappend "manually" */ + size_t kernel_size = 0, initrd_size = 0; + char* kernel_name; + void* kernel_data, *initrd_buf; + char *s, *s0, *t, *initrd_arg; + struct initramfs *initramfs = NULL; + + char *arg; + opt_quiet = false; + + kernel_name = refdup_word(&cmdline); + loadfile(kernel_name, &kernel_data, &kernel_size); +...

This attempts to implement the idea proposed in https://www.redhat.com/archives/libguestfs/2010-April/msg00087.html The idea is that an externally managed QEMU (manual, or via libvirt) can boot the appliance kernel/initrd. libguestfs can then be just told of the UNIX domain socket associated with the guest daemon. An example based on guestfish. 1. Step one, find the appliance kernel/initrd

...el) The firmware NULL check seems first, unnecessary, and second, inconsistent. > @@ -129,3 +137,70 @@ bail: > printf("%s\n", strerror(errno)); > return 1; > } > + > + > +int new_efi_image(char *okernel, char *ocmdline) > +{ > + const char *kernel_name = NULL, *args = NULL; > + char *temp; > + void *kernel_data; > + size_t kernel_len, cmdline_len; > + char *cmdline=NULL; > + > + > + //lets clear the screen before loading the efi image > + if(firmware && firmware->clear_screen) > + fir...

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...n) + firmware->clear_screen(); + dprintf("okernel = %s, ocmdline = %s", okernel, ocmdline); if (okernel) @@ -129,3 +137,70 @@ bail: printf("%s\n", strerror(errno)); return 1; } + + +int new_efi_image(char *okernel, char *ocmdline) +{ + const char *kernel_name = NULL, *args = NULL; + char *temp; + void *kernel_data; + size_t kernel_len, cmdline_len; + char *cmdline=NULL; + + + //lets clear the screen before loading the efi image + if(firmware && firmware->clear_screen) + firmware->clear_screen(); + + + dprintf("ok...

...nd you only have Xen domU kernels installed, try installing a fullvirt kernel (only for -supermin use, you shouldn't boot the Xen guest with it).\n" - host_cpu; - exit 1 +supermin use, you shouldn't boot the Xen guest with it)." + host_cpu and find_dtb debug copy_kernel kernel_name wildcard dtb = let dtb_file = @@ -180,27 +179,25 @@ and find_dtb debug copy_kernel kernel_name wildcard dtb = copy_or_symlink_file copy_kernel dtb_file dtb and no_dtb_dir kernel_name = - eprintf "\ -supermin: failed to find a dtb (device tree) directory. + error "\ +failed to...

Since v2: - Use string_suffix kernel_name "-debug" || string_suffix kernel_name "-dbg" - This requires addition of the string_suffix function and some tests

Hi, few cleanups in the supermin codebase; no actual functional change. Thanks, -- Pino Toscano (3): ext2: simplify tracking of visited modules utils: remove unused run_python function Add and use an helper error function src/build.ml | 20 +++++----------- src/dpkg.ml | 4 +--- src/ext2_initrd.ml | 10 ++++---- src/kernel.ml | 27

.../com32/elflink/ldlinux/kernel.c 2016-03-01 21:06:02.000000000 -0800 > +++ syslinux-6.04-pre1/com32/elflink/ldlinux/kernel.c 2016-06-08 20:08:43.000000000 -0700 > @@ -48,14 +48,6 @@ int new_linux_kernel(char *okernel, char > > sprintf(cmdline, "BOOT_IMAGE=%s %s", kernel_name, args); > > - /* "keeppxe" handling */ > -#if IS_PXELINUX > - extern char KeepPXE; > - > - if (strstr(cmdline, "keeppxe")) > - KeepPXE |= 1; > -#endif > - > if (strstr(cmdline, "quiet")) >...

Is this possible. I did my first one yesterday in order to get my iPod mini to work with the EL kernel. It worked well. Everything went smoothly, but I don't like what I named it. So I'd like to take one more shot at it. If I do, is there a way to remove the old one cleanly? Modules and everything. Also, if do recompile the kernel again, do I need fresh source, or can I just do a make

.... --- syslinux-6.04-pre1.orig/com32/elflink/ldlinux/kernel.c 2016-03-01 21:06:02.000000000 -0800 +++ syslinux-6.04-pre1/com32/elflink/ldlinux/kernel.c 2016-06-08 20:08:43.000000000 -0700 @@ -48,14 +48,6 @@ int new_linux_kernel(char *okernel, char sprintf(cmdline, "BOOT_IMAGE=%s %s", kernel_name, args); - /* "keeppxe" handling */ -#if IS_PXELINUX - extern char KeepPXE; - - if (strstr(cmdline, "keeppxe")) - KeepPXE |= 1; -#endif - if (strstr(cmdline, "quiet")) opt_quiet = true; --- syslinux-6.04-pre1.orig/com32/lib/syslinux/load_linux.c 2016-03-01 21...

...0644 > --- a/lib/appliance.c > +++ b/lib/appliance.c > @@ -222,7 +222,7 @@ search_appliance (guestfs_h *g, struct appliance_files *appliance) > static int > contains_old_style_appliance (guestfs_h *g, const char *path, void *data) > { > - return dir_contains_files (g, path, kernel_name, initrd_name, NULL); > + return dir_contains_files (g, path, kernel_name, initrd_name, (void *) NULL); > } > > static int > @@ -230,7 +230,7 @@ contains_fixed_appliance (guestfs_h *g, const char *path, void *data) > { > return dir_contains_files (g, path, >...