thr3ads.net - Libguestfs - [Libguestfs] [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot [Mar 2014]

If this information is useful, please help other people find it:
Share via:

Hilko Bengen

2014-Mar-08 21:18 UTC

[Libguestfs] supermin and dpkg-divert

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 is that I have the binutils-multiarch package installed
which has used dpkg-divert(8) to override the "regular" binutils
binaries.

,----
| $ dpkg-divert --list /usr/bin/strings
| diversion of /usr/bin/strings to /usr/bin/strings.single by binutils-multiarch
`----

I have been able to reproduce the problem with a minimal appliance
(again, with binutils-multiarch installed):

,----
| $ supermin --prepare bash binutils coreutils libc-bin -o supermin.d
--use-installed
| $ cp init.tar supermin.d
| $ supermin --build --format ext2 supermin.d -o appliance.d
| $ qemu-system-x86_64 \
| >     -display none \
| >     -serial stdio \
| >     -kernel appliance.d/kernel \
| >     -initrd appliance.d/initrd \
| >     -append 'console=ttyS0' \
| >     -drive file=appliance.d/root,format=raw,if=virtio
| [...]
| I have no name!@(none):/# ldd /usr/bin/strings
| 	linux-vdso.so.1 (0x00007fffb1944000)
| 	libbfd-2.24-multiarch.so => not found
| 	libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f16c7429000)
| 	libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f16c7210000)
| 	libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f16c6e67000)
| 	/lib64/ld-linux-x86-64.so.2 (0x00007f16c762f000)
`----

Here are some patches that have fixed the issue for me.

Cheers,
-Hilko

Hilko Bengen

2014-Mar-08 21:18 UTC

head link

[Libguestfs] [supermin 1/3] Recognize dpkg-divert

---
 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 5a92034..f7e0402 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])
+AC_PATH_PROG(DPKG_DIVERT,[[dpkg-divert]],[no])
 
 dnl For FrugalWare handler (currently disabled).
 AC_PATH_PROG(PACMAN_G2,[pacman-g2],[no])
diff --git a/src/config.ml.in b/src/config.ml.in
index 5326bb0..acf2912 100644
--- a/src/config.ml.in
+++ b/src/config.ml.in
@@ -26,6 +26,7 @@ let cpio = "@CPIO@"
 let dpkg = "@DPKG@"
 let dpkg_deb = "@DPKG_DEB@"
 let dpkg_query = "@DPKG_QUERY@"
+let dpkg_divert = "@DPKG_DIVERT@"
 let fakeroot = "@FAKEROOT@"
 let makepkg = "@MAKEPKG@"
 let pacman = "@PACMAN@"
diff --git a/src/dpkg.ml b/src/dpkg.ml
index 71aa12c..c28354a 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -26,6 +26,7 @@ let dpkg_detect ()    Config.dpkg <> "no"
&&
     Config.dpkg_deb <> "no" &&
     Config.dpkg_query <> "no" &&
+    Config.dpkg_divert <> "no" &&
     Config.apt_get <> "no" &&
     file_exists "/etc/debian_version"
 
-- 
1.9.0

Hilko Bengen

2014-Mar-08 21:18 UTC

head link

[Libguestfs] [supermin 2/3] Add file.source_path

---
 src/dpkg.ml             | 6 +++++-
 src/package_handler.ml  | 1 +
 src/package_handler.mli | 4 ++++
 src/pacman.ml           | 2 +-
 src/rpm.ml              | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/dpkg.ml b/src/dpkg.ml
index c28354a..22c4f16 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -166,7 +166,11 @@ 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
+      let source_path +        try List.hd (run_command_get_lines cmd)
+        with Not_found -> path in
+      { ft_path = path; ft_source_path = source_path; ft_config = config }
   ) lines
 
 let dpkg_download_all_packages pkgs dir diff --git a/src/package_handler.ml
b/src/package_handler.ml
index 10a9e3d..5aa27ba 100644
--- a/src/package_handler.ml
+++ b/src/package_handler.ml
@@ -43,6 +43,7 @@ let no_settings  
 type file = {
   ft_path : string;
+  ft_source_path : string;
   ft_config : bool;
 }
 
diff --git a/src/package_handler.mli b/src/package_handler.mli
index 3dcf97e..fa7b396 100644
--- a/src/package_handler.mli
+++ b/src/package_handler.mli
@@ -74,6 +74,10 @@ type file = {
   ft_path : string;
   (** File path. *)
 
+  ft_source_path : string;
+  (** File's source path.  dpkg has a mechanism called
"dpkg-divert"
+      can be used to override a package's version of a file. *)
+
   ft_config : bool;
   (** Flag to indicate this is a configuration file.  In some package
       managers (RPM) this is stored in package metadata.  In others
diff --git a/src/pacman.ml b/src/pacman.ml
index dbaf4c8..6393cfa 100644
--- a/src/pacman.ml
+++ b/src/pacman.ml
@@ -155,7 +155,7 @@ let pacman_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 }
+      { ft_path = path; ft_source_path = path; ft_config = config }
   ) lines
 
 let pacman_download_all_packages pkgs dir diff --git a/src/rpm.ml b/src/rpm.ml
index e022fa5..6e7afdb 100644
--- a/src/rpm.ml
+++ b/src/rpm.ml
@@ -174,7 +174,7 @@ let rpm_get_all_files pkgs      function
     | [ path; flags ] ->
       let config = String.contains flags 'c' in
-      { ft_path = path; ft_config = config }
+      { ft_path = path; ft_source_path = path; ft_config = config }
     | _ -> assert false
   ) lines
 
-- 
1.9.0

Hilko Bengen

2014-Mar-08 21:18 UTC

head link

[Libguestfs] [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot

---
 src/build.ml  | 39 +++++++++++++++++++++++----------------
 src/chroot.ml | 13 +++++++------
 src/dpkg.ml   | 14 ++++++++++++--
 src/ext2.ml   |  5 ++++-
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/build.ml b/src/build.ml
index 9225184..3d4ecad 100644
--- a/src/build.ml
+++ b/src/build.ml
@@ -106,11 +106,7 @@ let rec build debug
    *)
   let files = get_all_files packages in
   let files -    filter_map (
-      function
-      | { ft_config = false; ft_path = path } -> Some path
-      | { ft_config = true } -> None
-    ) files in
+    List.filter (fun file -> not file.ft_config) files in
 
   if debug >= 1 then
     printf "supermin: build: %d files\n%!" (List.length files);
@@ -120,8 +116,8 @@ let rec build debug
    *)
   let files      List.filter (
-      fun path ->
-        try ignore (lstat path); true
+      fun file ->
+        try ignore (lstat file.ft_source_path); true
         with Unix_error (err, fn, _) -> false
     ) files in
 
@@ -139,9 +135,9 @@ let rec build debug
     else (
       let fn_flags = [FNM_NOESCAPE] in
       List.filter (
-        fun path ->
+        fun file ->
           List.for_all (
-            fun pattern -> not (fnmatch pattern path fn_flags)
+            fun pattern -> not (fnmatch pattern file.ft_path fn_flags)
           ) appliance.excludefiles
       ) files
     ) in
@@ -159,7 +155,9 @@ let rec build debug
       ) appliance.hostfiles in
       let hostfiles = List.map Array.to_list hostfiles in
       let hostfiles = List.flatten hostfiles in
-      files @ hostfiles
+      files @ (List.map
+                 (fun path -> {ft_path = path; ft_source_path = path;
ft_config = false})
+                 hostfiles)
     ) in
 
   if debug >= 1 then
@@ -326,7 +324,9 @@ and isalnum = function
  * symlink.
  *)
 and munge files -  let files = List.sort compare files in
+  let paths +    List.sort compare
+      (List.map (fun file -> file.ft_path) files) in
 
   let rec stat_is_dir dir      try (stat dir).st_kind = S_DIR with Unix_error _
-> false
@@ -336,7 +336,7 @@ and munge files    in
 
   let insert_dir, dir_seen -    let h = Hashtbl.create (List.length files) in
+    let h = Hashtbl.create (List.length paths) in
     let insert_dir dir = Hashtbl.replace h dir true in
     let dir_seen dir = Hashtbl.mem h dir in
     insert_dir, dir_seen
@@ -385,10 +385,17 @@ and munge files        (* Have we seen this parent
directory before? *)
       let dir = Filename.dirname file in
       if not (dir_seen dir) then
-        loop (dir :: file :: rest)
+        loop (dir :: rest)
       else
-        file :: loop rest
+        loop rest
   in
-  let files = loop files in
+  let dir_paths = loop paths in
+
+  let dirs = List.map (fun path ->
+    {ft_path = path; ft_source_path = path; ft_config = false}
+  ) dir_paths in
+  let files = List.filter (fun file ->
+    not (dir_seen file.ft_path)
+  ) files in
 
-  files
+  dirs @ files
diff --git a/src/chroot.ml b/src/chroot.ml
index 1e1ddb2..53b9c2d 100644
--- a/src/chroot.ml
+++ b/src/chroot.ml
@@ -20,13 +20,15 @@ open Unix
 open Printf
 
 open Utils
+open Package_handler
 
 let build_chroot debug files outputdir    List.iter (
-    fun path ->
+    fun file ->
       try
+        let path = file.ft_source_path in
         let st = lstat path in
-        let opath = outputdir // path in
+        let opath = outputdir // file.ft_path in
         match st.st_kind with
         | S_DIR ->
           (* Note we fix up the permissions of directories in a second
@@ -64,10 +66,9 @@ let build_chroot debug files outputdir    ) files;
 
   (* Second pass: fix up directory permissions in reverse. *)
-  let dirs = filter_map (
-    fun path ->
-      let st = lstat path in
-      if st.st_kind = S_DIR then Some (path, st) else None
+  let dirs = filter_map (fun file ->
+    let st = lstat file.ft_source_path in
+    if st.st_kind = S_DIR then Some (file.ft_path, st) else None
   ) files in
   List.iter (
     fun (path, st) ->
diff --git a/src/dpkg.ml b/src/dpkg.ml
index 22c4f16..efc8123 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -155,6 +155,17 @@ let dpkg_get_all_requires pkgs    loop pkgs
 
 let dpkg_get_all_files pkgs +  let cmd = sprintf "%s --list"
Config.dpkg_divert in
+  let lines = run_command_get_lines cmd in
+  let diversions = Hashtbl.create (List.length lines) in
+  List.iter (
+    fun line ->
+    let items = string_split " " line in
+    match items with
+    | ["diversion"; "of"; path; "to"; real_path;
"by"; pkg] ->
+      Hashtbl.add diversions path real_path
+    | _ -> ()
+  ) lines;
   let cmd      sprintf "%s --listfiles %s | grep '^/' | grep -v
'^/.$' | sort -u"
       Config.dpkg_query
@@ -166,9 +177,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
-      let cmd = sprintf "%s --truename %s" Config.dpkg_divert path in
       let source_path -        try List.hd (run_command_get_lines cmd)
+        try Hashtbl.find diversions path
         with Not_found -> path in
       { ft_path = path; ft_source_path = source_path; ft_config = config }
   ) lines
diff --git a/src/ext2.ml b/src/ext2.ml
index 701f52e..a6b5477 100644
--- a/src/ext2.ml
+++ b/src/ext2.ml
@@ -21,6 +21,7 @@ open Printf
 
 open Utils
 open Ext2fs
+open Package_handler
 
 (* The ext2 image that we build always has a fixed size, and we 'hope'
  * that the files fit in (otherwise we'll get an error).  Note that
@@ -66,7 +67,9 @@ let build_ext2 debug basedir files modpath kernel_version
appliance      printf "supermin: ext2: copying files from host
filesystem\n%!";
 
   (* Copy files from host filesystem. *)
-  List.iter (fun path -> ext2fs_copy_file_from_host fs path path) files;
+  List.iter (fun file -> 
+    ext2fs_copy_file_from_host fs file.ft_source_path file.ft_path
+  ) files;
 
   if debug >= 1 then
     printf "supermin: ext2: copying kernel modules\n%!";
-- 
1.9.0

Hilko Bengen

2014-Mar-10 10:33 UTC

head link

[Libguestfs] supermin and dpkg-divert, take 2

I fixed a corner case (diversion only registered, not taken) and
cleaned up the patches.

Cheers,
-Hilko

Hilko Bengen

2014-Mar-10 10:33 UTC

head link

[Libguestfs] [supermin 1/3] Recognize dpkg-divert

---
 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 5a92034..f7e0402 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])
+AC_PATH_PROG(DPKG_DIVERT,[[dpkg-divert]],[no])
 
 dnl For FrugalWare handler (currently disabled).
 AC_PATH_PROG(PACMAN_G2,[pacman-g2],[no])
diff --git a/src/config.ml.in b/src/config.ml.in
index 5326bb0..acf2912 100644
--- a/src/config.ml.in
+++ b/src/config.ml.in
@@ -26,6 +26,7 @@ let cpio = "@CPIO@"
 let dpkg = "@DPKG@"
 let dpkg_deb = "@DPKG_DEB@"
 let dpkg_query = "@DPKG_QUERY@"
+let dpkg_divert = "@DPKG_DIVERT@"
 let fakeroot = "@FAKEROOT@"
 let makepkg = "@MAKEPKG@"
 let pacman = "@PACMAN@"
diff --git a/src/dpkg.ml b/src/dpkg.ml
index 71aa12c..c28354a 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -26,6 +26,7 @@ let dpkg_detect ()    Config.dpkg <> "no"
&&
     Config.dpkg_deb <> "no" &&
     Config.dpkg_query <> "no" &&
+    Config.dpkg_divert <> "no" &&
     Config.apt_get <> "no" &&
     file_exists "/etc/debian_version"
 
-- 
1.9.0

Hilko Bengen

2014-Mar-10 10:33 UTC

head link

[Libguestfs] [supermin 2/3] Add file.source_path, no functional changes

---
 src/dpkg.ml             | 3 ++-
 src/package_handler.ml  | 1 +
 src/package_handler.mli | 4 ++++
 src/pacman.ml           | 2 +-
 src/rpm.ml              | 2 +-
 5 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/src/package_handler.ml
b/src/package_handler.ml
index 10a9e3d..5aa27ba 100644
--- a/src/package_handler.ml
+++ b/src/package_handler.ml
@@ -43,6 +43,7 @@ let no_settings  
 type file = {
   ft_path : string;
+  ft_source_path : string;
   ft_config : bool;
 }
 
diff --git a/src/package_handler.mli b/src/package_handler.mli
index 3dcf97e..fa7b396 100644
--- a/src/package_handler.mli
+++ b/src/package_handler.mli
@@ -74,6 +74,10 @@ type file = {
   ft_path : string;
   (** File path. *)
 
+  ft_source_path : string;
+  (** File's source path.  dpkg has a mechanism called
"dpkg-divert"
+      can be used to override a package's version of a file. *)
+
   ft_config : bool;
   (** Flag to indicate this is a configuration file.  In some package
       managers (RPM) this is stored in package metadata.  In others
diff --git a/src/pacman.ml b/src/pacman.ml
index dbaf4c8..6393cfa 100644
--- a/src/pacman.ml
+++ b/src/pacman.ml
@@ -155,7 +155,7 @@ let pacman_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 }
+      { ft_path = path; ft_source_path = path; ft_config = config }
   ) lines
 
 let pacman_download_all_packages pkgs dir diff --git a/src/rpm.ml b/src/rpm.ml
index e022fa5..6e7afdb 100644
--- a/src/rpm.ml
+++ b/src/rpm.ml
@@ -174,7 +174,7 @@ let rpm_get_all_files pkgs      function
     | [ path; flags ] ->
       let config = String.contains flags 'c' in
-      { ft_path = path; ft_config = config }
+      { ft_path = path; ft_source_path = path; ft_config = config }
     | _ -> assert false
   ) lines
 
-- 
1.9.0

Hilko Bengen

2014-Mar-10 10:33 UTC

head link

[Libguestfs] [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot

---
 src/build.ml  | 43 ++++++++++++++++++++++++++-----------------
 src/chroot.ml | 12 +++++++-----
 src/dpkg.ml   | 17 +++++++++++++++--
 src/ext2.ml   |  8 +++++++-
 4 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/build.ml b/src/build.ml
index 9225184..205701b 100644
--- a/src/build.ml
+++ b/src/build.ml
@@ -106,11 +106,7 @@ let rec build debug
    *)
   let files = get_all_files packages in
   let files -    filter_map (
-      function
-      | { ft_config = false; ft_path = path } -> Some path
-      | { ft_config = true } -> None
-    ) files in
+    List.filter (fun file -> not file.ft_config) files in
 
   if debug >= 1 then
     printf "supermin: build: %d files\n%!" (List.length files);
@@ -120,9 +116,11 @@ let rec build debug
    *)
   let files      List.filter (
-      fun path ->
-        try ignore (lstat path); true
-        with Unix_error (err, fn, _) -> false
+      fun file ->
+        try ignore (lstat file.ft_source_path); true
+        with Unix_error (err, fn, _) ->
+          try ignore (lstat file.ft_path); true
+          with Unix_error (err, fn, _) -> false
     ) files in
 
   if debug >= 1 then
@@ -139,9 +137,9 @@ let rec build debug
     else (
       let fn_flags = [FNM_NOESCAPE] in
       List.filter (
-        fun path ->
+        fun file ->
           List.for_all (
-            fun pattern -> not (fnmatch pattern path fn_flags)
+            fun pattern -> not (fnmatch pattern file.ft_path fn_flags)
           ) appliance.excludefiles
       ) files
     ) in
@@ -159,7 +157,9 @@ let rec build debug
       ) appliance.hostfiles in
       let hostfiles = List.map Array.to_list hostfiles in
       let hostfiles = List.flatten hostfiles in
-      files @ hostfiles
+      files @ (List.map
+                 (fun path -> {ft_path = path; ft_source_path = path;
ft_config = false})
+                 hostfiles)
     ) in
 
   if debug >= 1 then
@@ -326,7 +326,9 @@ and isalnum = function
  * symlink.
  *)
 and munge files -  let files = List.sort compare files in
+  let paths +    List.sort compare
+      (List.map (fun file -> file.ft_path) files) in
 
   let rec stat_is_dir dir      try (stat dir).st_kind = S_DIR with Unix_error _
-> false
@@ -336,7 +338,7 @@ and munge files    in
 
   let insert_dir, dir_seen -    let h = Hashtbl.create (List.length files) in
+    let h = Hashtbl.create (List.length paths) in
     let insert_dir dir = Hashtbl.replace h dir true in
     let dir_seen dir = Hashtbl.mem h dir in
     insert_dir, dir_seen
@@ -385,10 +387,17 @@ and munge files        (* Have we seen this parent
directory before? *)
       let dir = Filename.dirname file in
       if not (dir_seen dir) then
-        loop (dir :: file :: rest)
+        loop (dir :: rest)
       else
-        file :: loop rest
+        loop rest
   in
-  let files = loop files in
+  let dir_paths = loop paths in
+
+  let dirs = List.map (fun path ->
+    {ft_path = path; ft_source_path = path; ft_config = false}
+  ) dir_paths in
+  let files = List.filter (fun file ->
+    not (dir_seen file.ft_path)
+  ) files in
 
-  files
+  dirs @ files
diff --git a/src/chroot.ml b/src/chroot.ml
index 1e1ddb2..b5c1e53 100644
--- a/src/chroot.ml
+++ b/src/chroot.ml
@@ -20,13 +20,15 @@ open Unix
 open Printf
 
 open Utils
+open Package_handler
 
 let build_chroot debug files outputdir    List.iter (
-    fun path ->
+    fun file ->
       try
+        let path = file.ft_source_path in
         let st = lstat path in
-        let opath = outputdir // path in
+        let opath = outputdir // file.ft_path in
         match st.st_kind with
         | S_DIR ->
           (* Note we fix up the permissions of directories in a second
@@ -65,9 +67,9 @@ let build_chroot debug files outputdir  
   (* Second pass: fix up directory permissions in reverse. *)
   let dirs = filter_map (
-    fun path ->
-      let st = lstat path in
-      if st.st_kind = S_DIR then Some (path, st) else None
+    fun file ->
+      let st = lstat file.ft_source_path in
+      if st.st_kind = S_DIR then Some (file.ft_path, st) else None
   ) files in
   List.iter (
     fun (path, st) ->
diff --git a/src/dpkg.ml b/src/dpkg.ml
index 5a650b8..efc8123 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -155,6 +155,17 @@ let dpkg_get_all_requires pkgs    loop pkgs
 
 let dpkg_get_all_files pkgs +  let cmd = sprintf "%s --list"
Config.dpkg_divert in
+  let lines = run_command_get_lines cmd in
+  let diversions = Hashtbl.create (List.length lines) in
+  List.iter (
+    fun line ->
+    let items = string_split " " line in
+    match items with
+    | ["diversion"; "of"; path; "to"; real_path;
"by"; pkg] ->
+      Hashtbl.add diversions path real_path
+    | _ -> ()
+  ) lines;
   let cmd      sprintf "%s --listfiles %s | grep '^/' | grep -v
'^/.$' | sort -u"
       Config.dpkg_query
@@ -166,8 +177,10 @@ let dpkg_get_all_files pkgs        let config  	try
string_prefix "/etc/" path && (lstat path).st_kind = S_REG
 	with Unix_error _ -> false in
-      let cmd = sprintf "%s --truename %s" Config.dpkg_divert path in
-      { ft_path = path; ft_source_path = path; ft_config = config }
+      let source_path +        try Hashtbl.find diversions path
+        with Not_found -> path in
+      { ft_path = path; ft_source_path = source_path; ft_config = config }
   ) lines
 
 let dpkg_download_all_packages pkgs dir diff --git a/src/ext2.ml b/src/ext2.ml
index 701f52e..ccaa81f 100644
--- a/src/ext2.ml
+++ b/src/ext2.ml
@@ -21,6 +21,7 @@ open Printf
 
 open Utils
 open Ext2fs
+open Package_handler
 
 (* The ext2 image that we build always has a fixed size, and we 'hope'
  * that the files fit in (otherwise we'll get an error).  Note that
@@ -66,7 +67,12 @@ let build_ext2 debug basedir files modpath kernel_version
appliance      printf "supermin: ext2: copying files from host
filesystem\n%!";
 
   (* Copy files from host filesystem. *)
-  List.iter (fun path -> ext2fs_copy_file_from_host fs path path) files;
+  List.iter (fun file ->
+    if file_exists file.ft_source_path then
+      ext2fs_copy_file_from_host fs file.ft_source_path file.ft_path
+    else
+      ext2fs_copy_file_from_host fs file.ft_path file.ft_path
+  ) files;
 
   if debug >= 1 then
     printf "supermin: ext2: copying kernel modules\n%!";
-- 
1.9.0

Richard W.M. Jones

2014-Mar-11 09:55 UTC

head link

Re: [Libguestfs] supermin and dpkg-divert

On Sat, Mar 08, 2014 at 10:18:41PM +0100, Hilko Bengen
wrote:> 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 is that I have the binutils-multiarch package installed
> which has used dpkg-divert(8) to override the "regular" binutils
> binaries.
> 
> ,----
> | $ dpkg-divert --list /usr/bin/strings
> | diversion of /usr/bin/strings to /usr/bin/strings.single by
binutils-multiarch
> `----
I'm really unclear even after reading the dpkg-divert man page what
dpkg-divert does.  Is it designed so that package B can move package
A's files around?

Is it possible for the dpkg supermin plugin to simply change ft_path
when it detects that the original file has been diverted?

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v

Hilko Bengen

2014-Mar-11 12:29 UTC

head link

Re: [Libguestfs] supermin and dpkg-divert

* Richard W.M. Jones:
> I'm really unclear even after reading the dpkg-divert man page what
> dpkg-divert does. Is it designed so that package B can move package
> A's files around?
If the local administrator or package B's preinst script have registered
a diversion for one of package A's files, they an alternative
implementation for that file -- or a wrapper script in the case of
executables. Renaming of the file takes effect immediately if
dpkg-divert is called with --rename or when package A is upgraded.

(I use this feature for a local modification to my build chroots that
calls dpkg using the eatmydata wrapper.)

I think that the description in
https://www.debian.org/doc/debian-policy/ap-pkg-diversions.html is
better than the manpage.
> Is it possible for the dpkg supermin plugin to simply change ft_path
> when it detects that the original file has been diverted?
Wouldn't the diverted filename then be used in the ext2 or chroot
building code?

Cheers,
-Hilko

Apparently Analagous Threads

Search for more possibly parallel threads

Libguestfs - Mar 2014 - [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot

[Libguestfs] supermin and dpkg-divert

[Libguestfs] [supermin 1/3] Recognize dpkg-divert

[Libguestfs] [supermin 2/3] Add file.source_path

[Libguestfs] [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot

[Libguestfs] supermin and dpkg-divert, take 2

[Libguestfs] [supermin 1/3] Recognize dpkg-divert

[Libguestfs] [supermin 2/3] Add file.source_path, no functional changes

[Libguestfs] [supermin 3/3] Use the file tuple up to the point where files are copied into the filesystem / chroot

Re: [Libguestfs] supermin and dpkg-divert

Re: [Libguestfs] supermin and dpkg-divert

Apparently Analagous Threads