mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Parse /etc/hostname files containing comments

Browse Source 
Thanks: Dawid Zamirski
Link: https://www.freedesktop.org/software/systemd/man/hostname.html
Acked-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit 4a517601c7)
This commit is contained in:
Richard W.M. Jones
2022-07-20 12:33:09 +01:00
parent f162e47ecf
commit 55370c688c
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
daemon/inspect_fs_unix.ml
View File

@@ -551,15 +551,28 @@ and check_hostname_linux () =
else
None
(* Parse the hostname where it is stored directly in a file. *)
(* Parse the hostname where it is stored directly in a file.
*
* For /etc/hostname:
* "The file should contain a single newline-terminated hostname
* string. Comments (lines starting with a "#") are ignored."
* [https://www.freedesktop.org/software/systemd/man/hostname.html]
*
* For other hostname files the exact format is not clear, but
* hostnames cannot begin with "#" and cannot be empty, so ignoring
* those lines seems safe.
*)
and check_hostname_from_file filename =
let chroot =
let name = sprintf "check_hostname_from_file: %s" filename in
Chroot.create ~name () in
let hostname = Chroot.f chroot read_small_file filename in
match hostname with
| None | Some [] | Some [""] -> None
let keep_line line = line <> "" && not (String.is_prefix line "#") in
let lines = Option.map (List.filter keep_line) hostname in
match lines with
| None | Some [] -> None
| Some (hostname :: _) -> Some hostname
(* Parse the hostname from /etc/sysconfig/network. This must be