search for: s_reg

.../src/dpkg.ml +++ b/src/dpkg.ml @@ -28,7 +28,8 @@ let dpkg_detect () = Config.dpkg_query <> "no" && Config.dpkg_divert <> "no" && Config.apt_get <> "no" && - try (stat "/etc/debian_version").st_kind = S_REG with Unix_error _ -> false + (List.mem (Os_release.get_id ()) [ "debian"; "ubuntu" ] || + try (stat "/etc/debian_version").st_kind = S_REG with Unix_error _ -> false) let dpkg_primary_arch = ref "" let settings = ref no_settings diff --git a/...

Hi, let's make supermin use /etc/os-release as primary source instead of the various release files in /etc; apparently distros (e.g. openSUSE) are starting removing them. Thanks, Pino Toscano (2): Add simple handling of /etc/os-release Use os-release to detect the distro src/Makefile.am | 3 +++ src/dpkg.ml | 3 ++- src/os_release.ml | 78

...ot;.deps/t31.Tpo" -c -o t31.lo t31.c; \ then mv -f ".deps/t31.Tpo" ".deps/t31.Plo"; else rm -f ".deps/t31.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I. -I -g -O2 -MT t31.lo -MD -MP -MF .deps/t31.Tpo -c t31.c -fPIC -DPIC -o .libs/t31.o t31.c:60: unknown field `s_regs' specified in initializer t31.c:61: unknown field `s_regs' specified in initializer t31.c:62: unknown field `s_regs' specified in initializer t31.c:63: unknown field `s_regs' specified in initializer t31.c:64: unknown field `s_regs' specified in initializer t31.c:65: unknown fi...

...+39,10 @@ let fedora_detect () =  let opensuse_detect () =    Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&      Config.zypper <> "no" && -    try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false +    try +      (stat "/etc/SuSE-release").st_kind = S_REG || +      (stat "/etc/SUSE-brand").st_kind = S_REG +    with Unix_error _ -> false    let mageia_detect () =    Config.rpm <> "no" && Config.rpm2cpio <> &quo...

...files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dpkg.ml b/src/dpkg.ml index c28354a..5a650b8 100644 --- a/src/dpkg.ml +++ b/src/dpkg.ml @@ -166,7 +166,8 @@ let dpkg_get_all_files pkgs = let config = try string_prefix "/etc/" path && (lstat path).st_kind = S_REG with Unix_error _ -> false in - { ft_path = path; ft_config = config } + let cmd = sprintf "%s --truename %s" Config.dpkg_divert path in + { ft_path = path; ft_source_path = path; ft_config = config } ) lines let dpkg_download_all_packages pkgs dir = diff --git a...

...&& - (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] || + (List.mem (Os_release.get_id ()) [ "opensuse-leap"; "opensuse"; "sled"; "sles" ] || try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) let mageia_detect () = diff --git a/tests/test-harder.sh b/tests/test-harder.sh index cfa448a..54362de 100755 --- a/tests/test-harder.sh +++ b/tests/test-harder.sh @@ -29,7 +29,7 @@ if [ -f /etc/os-release ]; then distro=$(. /etc/os-release && echo $ID...

...h paths with e.g. spaces, brackets, etc. --- src/chroot.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chroot.ml b/src/chroot.ml index 63a5a79..d0ee4c3 100644 --- a/src/chroot.ml +++ b/src/chroot.ml @@ -60,7 +60,7 @@ let build_chroot debug files outputdir = | S_REG | S_CHR | S_BLK | S_FIFO | S_SOCK -> if debug >= 2 then printf "supermin: chroot: copy %s\n%!" opath; - let cmd = sprintf "cp -p %s %s" path opath in + let cmd = sprintf "cp -p %s %s" (quote path) (quote opath) in ignore (S...

...()) [ "opensuse-leap"; "opensuse"; "sled"; "sles" ] || + (List.mem (Os_release.get_id ()) [ "sled"; "sles" ] || + string_prefix "opensuse" (Os_release.get_id ()) || try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) let mageia_detect () = diff --git a/tests/test-harder.sh b/tests/test-harder.sh index 54362de..c827f13 100755 --- a/tests/test-harder.sh +++ b/tests/test-harder.sh @@ -29,7 +29,7 @@ if [ -f /etc/os-release ]; then distro=$(. /etc/os-release && echo $ID...

While trying to run libguestfs tests after building with "--enable-appliance --with-supermin-extra-options=--use-installed", I ran into a peculiar error message in the c-api test: ,---- | libguestfs: error: strings: /abssymlink: strings: error while loading | shared libraries: libbfd-2.24-multiarch.so: cannot open shared object | file: No such file or directory `---- The problem here

--- configure.ac | 1 + src/config.ml.in | 1 + src/dpkg.ml | 1 + 3 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 2141540..99ea913 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ AC_PATH_PROG(APT_GET,[apt-get],[no]) AC_PATH_PROG(DPKG,[dpkg],[no]) AC_PATH_PROG(DPKG_DEB,[dpkg-deb],[no]) AC_PATH_PROG(DPKG_QUERY,[dpkg-query],[no])

...(Filename.basename path)) in + if verbose () then + printf "Copying virtio driver bits: 'host:%s' -> '%s'\n" + source target; + + g#write target (read_whole_file source) + ) + ) paths + ) + else if is_regular_file virtio_win then ( + try + let g2 = new Guestfs.guestfs () in + if trace () then g2#set_trace true; + if verbose () then g2#set_verbose true; + g2#add_drive_opts virtio_win ~readonly:true; + g2#launch (); + let vio_root = "/" in +...

...fakeroot <> "no" && + ((Config.urpmi <> "no" && Config.fakeroot <> "no") || Config.dnf <> "no") && (Os_release.get_id () = "mageia" || try (stat "/etc/mageia-release").st_kind = S_REG with Unix_error _ -> false) @@ -389,7 +388,10 @@ and opensuse_download_all_packages pkgs dir = and mageia_download_all_packages pkgs dir = let tdir = !settings.tmpdir // string_random8 () in - mageia_download_all_packages_with_urpmi pkgs dir tdir; + if Config.dnf <> "no&quot...

...available () && Config.zypper <> "no" && (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] || + List.mem "suse" (Os_release.get_id_like ()) || try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) let mageia_detect () = -- 2.13.2

...available () && Config.zypper <> "no" && (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] || + List.mem "suse" (Os_release.get_id_like ()) || try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) let mageia_detect () = -- 2.13.2

...; - (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] || > + (List.mem (Os_release.get_id ()) [ "opensuse-leap"; "opensuse"; "sled"; "sles" ] || > try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) > > let mageia_detect () = > diff --git a/tests/test-harder.sh b/tests/test-harder.sh > index cfa448a..54362de 100755 > --- a/tests/test-harder.sh > +++ b/tests/test-harder.sh > @@ -29,7 +29,7 @@ if [ -f /etc/os-release ]; then > distro...

...(Filename.basename path)) in + if verbose () then + printf "Copying virtio driver bits: 'host:%s' -> '%s'\n" + source target; + + g#write target (read_whole_file source) + ) + ) paths + ) + else if is_regular_file virtio_win then ( + try + let g2 = new Guestfs.guestfs () in + if trace () then g2#set_trace true; + if verbose () then g2#set_verbose true; + g2#add_drive_opts virtio_win ~readonly:true; + g2#launch (); + let vio_root = "/" in +...

This patch series fixes several problems in the way that supermin handles kernels. The most pressing problem is that supermin doesn't handle bogus vmlinuz files which aren't actual kernels. Along the way there is a lot of clean up. The patches look much better if you view them with ‘-w’. This series will require plenty of time to be tested in Fedora, especially on non-x86 arches.

.../path/to/..." *) + let lines = List.filter ( + fun l -> l.[0] = '/' && l.[1] != '.' + ) lines in + let files = List.map ( + fun path -> + let statbuf = lstat path in + let is_dir = statbuf.st_kind = S_DIR in + let config = statbuf.st_kind = S_REG && string_prefix "/etc/" path in + let mode = statbuf.st_perm in + (path, { ft_dir = is_dir; ft_config = config; ft_mode = mode; + ft_ghost = false; ft_size = statbuf.st_size }) + ) lines in + files + +let debian_list_files pkg = + if List.exists ((=) pkg) inst...

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. That support, however, looks too heavy-weight: in order to access those drivers, a separate guestfs handle is created (and thus a new emulator process is started), which runs until v2v completes. This series attempts to make it simpler and lighter-weight, by making the relevant code more local, and by

Hi, this work makes supermin use the rpm library instead of invoking rpm directly. This, together with a needed refactoring of the dependency resolution, should help in make supermin faster on rpm-based systems. Surely the patches will still need polishing, especially for behaviours of newly added stuff, but at least it's a good starting point. Noting that you need rpm-devel on most of rpm