search for: 0o644

...n ( g#mkdir ssh_dir; - g#chmod 0o755 ssh_dir + g#chmod 0o700 ssh_dir ); (* Create ~user/.ssh/authorized_keys if it doesn't exist. *) let auth_keys = sprintf "%s/authorized_keys" ssh_dir in if not (g#exists auth_keys) then ( g#touch auth_keys; - g#chmod 0o644 auth_keys + g#chmod 0o600 auth_keys ); (* Append the key. *) diff --git a/src/guestfs.pod b/src/guestfs.pod index 75afa9d..366d6f5 100644 --- a/src/guestfs.pod +++ b/src/guestfs.pod @@ -2244,6 +2244,23 @@ allowed a malformed filesystem to take over the appliance. If you use sVirt to c...

.../ptmx"; "/dev/stdin"; "/dev/stdout"; "/dev/stderr" ] in @@ -215,7 +215,7 @@ let rec zypp_rpm_list_files pkg = List.map (fun name -> name, { ft_dir = false; ft_ghost = false; ft_config = false; ft_mode = 0o644; - ft_size = 0 }) devs in + ft_size = 0 }) devs in dirs @ devs @ files ) else files in

Hi, to ease debugging issues with appliances (e.g. when used in libguestfs), using --include-packagelist will add a file containing the list of all the packages used. Thanks, Pino Toscano (3): ext2: add ext2fs_chmod and ext2fs_chown chroot: factor out file copy code Add --include-packagelist src/build.ml | 42 +++++++++++++++++++++++++------ src/chroot.ml | 29

--- src/utils.ml | 21 +++++++++++++++++++++ src/utils.mli | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/utils.ml b/src/utils.ml index 3e81c21..7ae24bd 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -204,3 +204,24 @@ let compare_architecture a1 a2 = exit 1 in compare (index_of_architecture a1) (index_of_architecture a2) + +(* Parse a size field, eg. "10G".

I'm not going to put this upstream because there's no benefit. However it is useful to record the patch on the mailing list. Rich.

...ath kernel_version appliance = +let build_ext2 debug basedir files modpath kernel_version appliance size = if debug >= 1 then printf "supermin: ext2: creating empty ext2 filesystem '%s'\n%!" appliance; let fd = openfile appliance [O_WRONLY;O_CREAT;O_TRUNC;O_NOCTTY] 0o644 in - LargeFile.ftruncate fd appliance_size; + let size = + match size with + | None -> default_appliance_size + | Some s -> s in + LargeFile.ftruncate fd size; close fd; let cmd = diff --git a/src/prepare.ml b/src/prepare.ml index 75f21dc..7e522e9 100644 --- a/src/prepare....

...g#mkdir ssh_dir; + g#chmod 0o755 ssh_dir + ); + + (* Create ~user/.ssh/authorized_keys if it doesn't exist. *) + let auth_keys = sprintf "%s/authorized_keys" ssh_dir in + if not (g#exists auth_keys) then ( + g#touch auth_keys; + g#chmod 0o644 auth_keys + ); + + (* Append the key. *) + g#write_append auth_keys key + | typ -> + warning (f_"don't know how to inject SSH keys into %s guests") typ + in + (* Set the random seed. *) msg (f_"Setting a random seed"); if not (Random_seed....

The new run_shell helper is a copy of run_python, and will be used by upcoming changes. Signed-off-by: Olaf Hering <olaf at aepfle.de> --- src/supermin_utils.ml | 9 +++++++++ src/supermin_utils.mli | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/supermin_utils.ml b/src/supermin_utils.ml index f98e09a..cb8a27e 100644 --- a/src/supermin_utils.ml +++ b/src/supermin_utils.ml

...not (g#exists ssh_dir) then ( + g#mkdir ssh_dir; + g#chmod 0o755 ssh_dir + ); + + (* Create ~user/.ssh/authorized_keys if it doesn't exist. *) + let auth_keys = sprintf "%s/authorized_keys" ssh_dir in + if not (g#exists auth_keys) then ( + g#touch auth_keys; + g#chmod 0o644 auth_keys + ); + + (* Append the key. *) + g#write_append auth_keys key diff --git a/customize/ssh_key.mli b/customize/ssh_key.mli new file mode 100644 index 0000000..3223e55 --- /dev/null +++ b/customize/ssh_key.mli @@ -0,0 +1,31 @@ +(* virt-customize + * Copyright (C) 2014 Red Hat Inc. + * + *...

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

...e = 4L *^ 1024L *^ 1024L *^ 1024L + +let build_ext2 debug basedir files modpath kernel_version appliance = + if debug >= 1 then + printf "supermin: ext2: creating empty ext2 filesystem '%s'\n%!" appliance; + + let fd = openfile appliance [O_WRONLY;O_CREAT;O_TRUNC;O_NOCTTY] 0o644 in + LargeFile.ftruncate fd appliance_size; + close fd; + + let cmd = + sprintf "%s %s ext2 -F%s %s" + Config.mke2fs Config.mke2fs_t_option + (if debug >= 2 then "" else "q") + appliance in + run_command cmd; + + let fs = ext2fs_open appliance...

Split up the huge generator/actions.ml into several smaller files. Rich.