- use the same version of bdb utils that rpm does

[packages/util-vserver.git] / util-vserver-dbrebuild-internalize4.patch

diff --git a/util-vserver-dbrebuild-internalize4.patch b/util-vserver-dbrebuild-internalize4.patch
index 29d8e25f430a46c3649172a4fed9cf8c312ce27a..204dfff3849d7246d34732ccb6e7ff9ce494d106 100644 (file)
--- a/util-vserver-dbrebuild-internalize4.patch
+++ b/util-vserver-dbrebuild-internalize4.patch
@@ -1,5 +1,5 @@
---- util-vserver-0.30.215/scripts/pkgmgmt      2008-11-17 20:58:47.120292384 +0200
-+++ util-vserver-0.30.215/scripts/pkgmgmt      2008-11-17 22:47:02.486514626 +0200
+--- util-vserver-0.30.215/scripts/pkgmgmt      2008-11-17 22:47:02.486514626 +0200
++++ util-vserver-0.30.216-r2844/scripts/pkgmgmt        2009-11-05 14:27:48.753407445 +0200
 @@ -185,6 +185,43 @@
      test -n "$is_ok"
  }
@@ -30,7 +30,7 @@
 +    }
 +    test -n "$guest_path" || {
 +      warning "
-+* The vserver does not seem to have the '$guest_tool' program which is required
++* The vserver guest does not seem to have the '$guest_tool' program which is required
 +  for $type package management. It is suggested to install it before
 +  continuing."
 +      res=1
@@ -49,7 +49,7 @@
            panic "
  Can not continue; use '--force' to override this check"
 +
-+      verifyDBTools "$vdir" 'internal' db_dump db_load || test -n "$IS_FORCE" ||
++      verifyDBTools "$vdir" 'internal' db@RPMDB@_dump db@RPMDB@_load || test -n "$IS_FORCE" ||
 +          panic "
 +Can not continue; use '--force' to override this check"
      
@@ -61,24 +61,27 @@
        findDir RPMETCDIR   "$cfgdir"/rpmetc   "$cfgdir"/base/rpm/etc    /etc/rpm /
        findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
      else
-+      verifyDBTools "$vdir" 'external' db_load db_dump || test -n "$IS_FORCE" ||
++      verifyDBTools "$vdir" 'external' db@RPMDB@_load db@RPMDB@_dump || test -n "$IS_FORCE" ||
 +          panic "
 +Can not continue; use '--force' to override this check"
 +
        mkdir -m755 -p "$cfgdir"
        local need_base=
  
-@@ -460,8 +506,38 @@
+@@ -460,8 +506,41 @@
        pushd "$vdir" >/dev/null
            ## remove %_dbpath settings
            _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
 +
++          ## remove vserver-packages ignore
++          _substFile /etc/poldek/poldek.conf '/^ignore[ \t]*=/s/vserver-packages//'
++
 +          # dump and reload rpmdb to overcome db version mismatch problems
 +          if [ "$db_load" -a "$db_dump" ]; then
-+              # dump with host db_dump
++              # dump with host db@RPMDB@_dump
 +              $db_dump var/lib/rpm/Packages > var/lib/rpm/.Packages.dump
 +
-+              # load with guest db_load.
++              # load with guest db@RPMDB@_load.
 +              $_RM -f var/lib/rpm/__db.*
 +              mv var/lib/rpm/{Packages,.Packages.ORIG}
 +              chroot . $db_load var/lib/rpm/Packages < var/lib/rpm/.Packages.dump
@@ -93,11 +96,11 @@
 +          if [ "$db_load" -a "$db_dump" ]; then
 +              # dump and reload rpmdb to overcome db version mismatch problems
 +
-+              # dump with guest db_dump
++              # dump with guest db@RPMDB@_dump
 +              $_RM -f var/lib/rpm/__db.*
 +              chroot . $db_dump var/lib/rpm/Packages > var/lib/rpm/.Packages.dump
 +
-+              # load with host db_load
++              # load with host db@RPMDB@_load
 +              mv var/lib/rpm/{Packages,.Packages.ORIG}
 +              $db_load var/lib/rpm/Packages < var/lib/rpm/.Packages.dump
 +              rm -f var/lib/rpm/.Packages.*