search for: update_etc_machine_info

...--- a/mllib/hostname.ml +++ b/mllib/hostname.ml @@ -79,7 +79,7 @@ and replace_line_in_file g filename key value = g#write filename content and update_etc_hostname g hostname = - g#write "/etc/hostname" hostname + g#write "/etc/hostname" (hostname ^ "\n") and update_etc_machine_info g hostname = replace_line_in_file g "/etc/machine-info" "PRETTY_HOSTNAME" hostname -- 1.8.3.1

On Thursday 13 February 2014 13:33:16 Richard W.M. Jones wrote: > On Thu, Feb 13, 2014 at 02:15:31PM +0100, Pino Toscano wrote: > > + let expr = "/files/etc/hosts/*[label() != '#comment']/*[label() > > != 'ipaddr'][. = '" ^ oldhost ^ "']" in > Quoting? If oldhost contains a ' character + some Augeas code, this > might be

...t; replace_host_in_etc_hosts g old_hostname hostname + | None -> () + ); true | "linux", ("fedora"|"rhel"|"centos"|"scientificlinux"|"redhat-based"), _ -> @@ -78,3 +83,20 @@ and update_etc_hostname g hostname = and update_etc_machine_info g hostname = replace_line_in_file g "/etc/machine-info" "PRETTY_HOSTNAME" hostname + +and read_etc_hostname g = + let filename = "/etc/hostname" in + if g#is_file filename then ( + let lines = Array.to_list (g#read_lines filename) in + match lines with +...

Read the information from os-release, and make it behave like a Debian distribution (i.e. using dpkg, and apt). --- daemon/inspect_fs.ml | 2 ++ daemon/inspect_fs_unix.ml | 1 + daemon/inspect_types.ml | 2 ++ daemon/inspect_types.mli | 1 + generator/actions_inspection.ml | 4 ++++ 5 files changed, 10 insertions(+) diff --git a/daemon/inspect_fs.ml

...t; replace_host_in_etc_hosts g old_hostname hostname + | None -> () + ); true | "linux", ("fedora"|"rhel"|"centos"|"scientificlinux"|"redhat-based"), _ -> @@ -78,3 +83,25 @@ and update_etc_hostname g hostname = and update_etc_machine_info g hostname = replace_line_in_file g "/etc/machine-info" "PRETTY_HOSTNAME" hostname + +and read_etc_hostname g = + let filename = "/etc/hostname" in + if g#is_file filename then ( + let lines = Array.to_list (g#read_lines filename) in + match lines with +...

...<= 7 then try_update_rc_d g root | "ubuntu" -> diff --git a/customize/hostname.ml b/customize/hostname.ml index 745e43ab6..88fcc0ca4 100644 --- a/customize/hostname.ml +++ b/customize/hostname.ml @@ -42,7 +42,7 @@ let rec set_hostname (g : Guestfs.guestfs) root hostname = update_etc_machine_info g hostname; true - | "linux", ("debian"|"ubuntu"), _ -> + | "linux", ("debian"|"ubuntu"|"kalilinux"), _ -> let old_hostname = read_etc_hostname g in update_etc_hostname g hostname; replace_host_in_et...

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

...t;|"suse-based" -> install_sysvinit_suse g diff --git a/customize/hostname.ml b/customize/hostname.ml index b49db8714df1..ee2c91e6a55d 100644 --- a/customize/hostname.ml +++ b/customize/hostname.ml @@ -36,7 +36,7 @@ let rec set_hostname (g : Guestfs.guestfs) root hostname = update_etc_machine_info g hostname; true - | "linux", ("rhel"|"centos"|"scientificlinux"|"redhat-based"), v + | "linux", ("rhel"|"centos"|"scientificlinux"|"oraclelinux"|"redhat-based"), v when v &gt...