search for: remove_consol

...name : string + method virtual augeas_device_patterns : string list + method virtual list_kernels : unit -> string list + method virtual set_default_kernel : string -> unit + method set_augeas_configuration () = false + method virtual configure_console : unit -> unit + method virtual remove_console : unit -> unit + method update () = () +end + +(* Helper type used in detect_bootloader. *) +type bootloader_type = + | Grub1 + | Grub2 + +(* Helper function for SUSE: remove (hdX,X) prefix from a path. *) +let remove_hd_prefix path = + let rex = Str.regexp "^(hd.*)\\(.*\\)" in +...

...irtual augeas_device_patterns : string list > + method virtual list_kernels : unit -> string list > + method virtual set_default_kernel : string -> unit > + method set_augeas_configuration () = false > + method virtual configure_console : unit -> unit > + method virtual remove_console : unit -> unit > + method update () = () > +end I think you'll also find that you don't need to use inheritance at all. You can just declare bootloader as a class type and declare two (unrelated) classes which implement the class type. They won't be able to inherit the two...

...with G.Error msg -> warning (f_"could not rebuild grub2 configuration file (%s). This may mean that grub output will not be sent to the serial port, but otherwise should be harmless. Original error message: %s") @@ -290,7 +303,7 @@ object (self) method remove_console = self#grub2_update_console ~remove:true method update () = - ignore (g#command [| "grub2-mkconfig"; "-o"; grub_config |]) + ignore (g#command [| grub2_mkconfig_cmd; "-o"; grub_config |]) end let detect_bootloader (g : G.guestfs) inspect = -- 2.9.3

...gt; - grub2_update_console ~remove:false - (* If the target doesn't support a serial console, we want to remove * all references to it instead. *) @@ -1013,71 +821,6 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = g#aug_save () - and grub_remove_console () = - match grub with - | `Grub1 -> - let rex = Str.regexp "\\(.*\\)\\b\\([xh]vc0\\)\\b\\(.*\\)" in - let expr = sprintf "/files%s/title/kernel/console" grub_config in - - let rec loop = function - | [] -> () - | path :: paths -> -...

...if g#exists "/sbin/grubby" then @@ -285,11 +285,9 @@ object (self) " vmlinuz |] in ignore (g#command cmd) - method configure_console () = - self#grub2_update_console ~remove:false + method configure_console = self#grub2_update_console ~remove:false - method remove_console () = - self#grub2_update_console ~remove:true + method remove_console = self#grub2_update_console ~remove:true method update () = ignore (g#command [| "grub2-mkconfig"; "-o"; grub_config |]) diff --git a/v2v/linux_bootloaders.mli b/v2v/linux_bootloaders.mli index...

...with G.Error msg -> warning (f_"could not rebuild grub2 configuration file (%s). This may mean that grub output will not be sent to the serial port, but otherwise should be harmless. Original error message: %s") @@ -290,7 +306,7 @@ object (self) method remove_console = self#grub2_update_console ~remove:true method update () = - ignore (g#command [| "grub2-mkconfig"; "-o"; grub_config |]) + ignore (g#command [| grub2_mkconfig_cmd; "-o"; grub_config |]) end let detect_bootloader (g : G.guestfs) inspect = -- 2.9.3

...irtual name : string + method virtual augeas_device_patterns : string list + method virtual list_kernels : unit -> string list + method virtual set_default : string -> unit + method set_augeas_configuration () = false + method virtual configure_console : unit -> unit + method virtual remove_console : unit -> unit + method update () = () +end + +(* Helper type used in detect_bootloader. *) +type bootloader_type = + | Grub1 + | Grub2 + +(* Helper function for SUSE: remove (hdX,X) prefix from a path. *) +let remove_hd_prefix path = + let rex = Str.regexp "^(hd.*)\\(.*\\)" in +...

...erns : string list > > + method virtual list_kernels : unit -> string list > > + method virtual set_default_kernel : string -> unit > > + method set_augeas_configuration () = false > > + method virtual configure_console : unit -> unit > > + method virtual remove_console : unit -> unit > > + method update () = () > > +end > > I think you'll also find that you don't need to use inheritance at > all. You can just declare bootloader as a class type and declare two > (unrelated) classes which implement the class type. They won...

...G.Error msg -> > warning (f_"could not rebuild grub2 configuration file (%s). This may mean that grub output will not be sent to the serial port, but otherwise should be harmless. Original error message: %s") > @@ -290,7 +306,7 @@ object (self) > method remove_console = self#grub2_update_console ~remove:true > > method update () = > - ignore (g#command [| "grub2-mkconfig"; "-o"; grub_config |]) > + ignore (g#command [| grub2_mkconfig_cmd; "-o"; grub_config |]) > end > > let detect_bootloader (g :...

...on demand. * diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index de3d107..cdab7bf 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -36,6 +36,7 @@ class virtual bootloader = object method virtual configure_console : unit -> unit method virtual remove_console : unit -> unit method update () = () + method virtual fix_efi_boot : unit -> string end (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) @@ -43,6 +44,115 @@ let remove_hd_prefix = let rex = PCRE.compile "^\\(hd.*\\)" in PCRE.replace rex ""...

...emand. * diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index de3d107e9..4ca28782b 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -36,6 +36,7 @@ class virtual bootloader = object method virtual configure_console : unit -> unit method virtual remove_console : unit -> unit method update () = () + method virtual get_config_file : unit -> string end (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) @@ -184,6 +185,9 @@ object loop paths; g#aug_save () + + method get_config_file () = + grub_config end (**...

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As