search for: current_arch

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1212807 Since v1: - Combine the virt-builder detection code into virt-customize. - Enables us to delete Architecture and Uname modules completely. Rich.

...name = "squashfs"; + check_appliance_prerequisites = Some squashfs_check; + run_on_filesystem = Some squashfs_run_fs; +} + +let () = register_format fmt diff --git a/dib/utils.ml b/dib/utils.ml index 3775a41..da5e738 100644 --- a/dib/utils.ml +++ b/dib/utils.ml @@ -33,6 +33,7 @@ let current_arch () = | arch -> arch let output_filename image_name = function + | "squashfs" -> image_name ^ ".squash" | fmt -> image_name ^ "." ^ fmt let log_filename () = diff --git a/dib/virt-dib.pod b/dib/virt-dib.pod index 2786050..7083e78 100644 --- a/dib/v...

...on_utils + +open Unix + +let filter_arch = function + | "amd64" | "x86_64" | "x64" -> "x86_64" + | "powerpc" | "ppc" -> "ppc" + | "armhfp" | "armhf" -> "armhf" + | arch -> arch + +let current_arch = + try filter_arch ((Uname.uname ()).Uname.machine) + with Unix_error _ -> "unknown" diff --git a/builder/builder.ml b/builder/builder.ml index 1800f2d..ed55de1 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -38,9 +38,9 @@ let () = Random.self_init () let main () =...

On Tuesday 11 March 2014 10:09:45 Richard W.M. Jones wrote: > On Mon, Mar 10, 2014 at 02:28:20PM +0100, Pino Toscano wrote: > > Add the possibility to choose which architecture use to build the > > wanted image (--arch). Since this implies that running commands on > > the guest is usually not possible when the architecture is > > different than the host one, another new

...the GNU General Public License along > + * with this program; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + *) > + > +val unit_GB : int -> int64 > +(** [unit_GB n] returns n * 2^30 *) > + > +val current_arch : unit -> string > +(** Turn the host_cpu into the dpkg architecture naming. *) > + > +val output_filename : string -> string -> string > +(** [output_filename image_name format] generates a suitable output > + filename based on the image filename and output format. *) &g...

...s from the hooks dir, as d-i-b (and we too) * has basically copied over anything found in elements. @@ -525,24 +525,24 @@ let main () = let log_file = "/tmp/aux/perm/" ^ (log_filename ()) in let arch = - match arch with + match cmdline.arch with | "" -> current_arch () | arch -> arch in let root_label = - match root_label with + match cmdline.root_label with | None -> (* XFS has a limit of 12 characters for filesystem labels. * Not changing the default for other filesystems to maintain * backwards compatibility...

Just refactoring. Rich.

...pts from the hooks dir, as d-i-b (and we too) + * has basically copied over anything found in elements. + *) + let final_hooks = load_hooks ~debug hookstmpdir in + + let log_file = "/tmp/aux/perm/" ^ (log_filename ()) in + + let arch = + match arch with + | "" -> current_arch () + | arch -> arch in + + let root_label = + match root_label with + | None -> + (* XFS has a limit of 12 characters for filesystem labels. + * Not changing the default for other filesystems to maintain + * backwards compatibility. + *) + (match fs_type...

...pts from the hooks dir, as d-i-b (and we too) + * has basically copied over anything found in elements. + *) + let final_hooks = load_hooks ~debug hookstmpdir in + + let log_file = "/tmp/aux/perm/" ^ (log_filename ()) in + + let arch = + match arch with + | "" -> current_arch () + | arch -> arch in + + let root_label = + match root_label with + | None -> + (* XFS has a limit of 12 characters for filesystem labels. + * Not changing the default for other filesystems to maintain + * backwards compatibility. + *) + (match fs_type...

Hi, this patch series does changes mostly in virt-dib, few bug fixes and a couple of new features (mostly implemented upstream already). In addition, one new API is added, and a new optional argument for an existing API is added (the latter is not needed, but could be useful anyway). Thanks, Pino Toscano (10): dib: fix listing envvars in fake-sudo dib: source dib "die" script in

...+ ); + + msg (f_"Preparing auxiliary data"); + + copy_elements all_elements loaded_elements + (blacklist @ builtin_scripts_blacklist) hookstmpdir; + + let log_file = "/tmp/aux/perm/" ^ (log_filename ~prog) in + + let arch = + match arch with + | "" -> current_arch () + | arch -> arch in + + let root_label = + match root_label with + | None -> + (* XFS has a limit of 12 characters for filesystem labels. + * Not changing the default for other filesystems to maintain + * backwards compatibility. + *) + (match fs_type...

...pts from the hooks dir, as d-i-b (and we too) + * has basically copied over anything found in elements. + *) + let final_hooks = load_hooks ~debug hookstmpdir in + + let log_file = "/tmp/aux/perm/" ^ (log_filename ()) in + + let arch = + match arch with + | "" -> current_arch () + | arch -> arch in + + let root_label = + match root_label with + | None -> + (* XFS has a limit of 12 characters for filesystem labels. + * Not changing the default for other filesystems to maintain + * backwards compatibility. + *) + (match fs_type...

...let lines = String.nsplit "\n" lines in let lines = List.filter ((<>) "") lines in stringset_of_list lines ) else diff --git a/dib/utils.ml b/dib/utils.ml index 34705f7..835da88 100644 --- a/dib/utils.ml +++ b/dib/utils.ml @@ -33,7 +33,7 @@ let current_arch () = match Config.host_cpu with | "amd64" | "x86_64" -> "amd64" | "i386" | "i486" | "i586" | "i686" -> "i386" - | arch when string_prefix arch "armv" -> "armhf" + | arch when Stri...

This works reliably for me ... Rich.

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

v1 -> v2: - Fixed everything mentioned in patch review. - Libdir module is removed as a separate commit. Rich.

...* + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +val unit_GB : int -> int64 +(** [unit_GB n] returns n * 2^30 *) + +val current_arch : unit -> string +(** Turn the host_cpu into the dpkg architecture naming. *) + +val output_filename : string -> string -> string +(** [output_filename image_name format] generates a suitable output + filename based on the image filename and output format. *) + +val log_filename : unit...

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing