X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=311e751bb9ecfdc352c7b422dab64476bd3217e0;hb=77ae19b10a522bada13e21f8b6b4fbbafd3169ef;hp=6c4d7c5d103f5cb7e2306db42957ad8810d3a251;hpb=5edcf81a7581d8f2d93a12bf3b9d6f61104d6e4c;p=build.git

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 6c4d7c5d..311e751b 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -8,7 +8,8 @@ COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 
 # pkgs parsing utilities
-PATH=$(dirname $0):$PATH . build.common
+PATH=$(dirname $0):$PATH export PATH
+. build.common
 
 DEFAULT_FCDISTRO=f8
 DEFAULT_PLDISTRO=planetlab
@@ -58,7 +59,7 @@ function configure_yum_in_vserver () {
 
     # for using vtest-init-vserver.sh as a general-purpose vserver creation wrapper
     # just mention 'none' as the repo url
-    if [ -n "$MYPLC_MODE" -a "$REPO_URL" !- "none" ] ; then
+    if [ -n "$MYPLC_MODE" -a "$REPO_URL" != "none" ] ; then
 	if [ ! -d /vservers/$vserver/etc/yum.repos.d ] ; then
 	    echo "WARNING : cannot create myplc repo"
 	else
@@ -187,8 +188,34 @@ function setup_vserver () {
     # redirect out/err to protect against the vserver's init sequence getting stalled 
     # mostly used for f10 vservers created remotely through ssh
     $personality vserver $VERBOSE $vserver start >& /dev/null
-    [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
-    [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+
+    if [ "$pkg_method" == "yum" ] ; then
+	$personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
+
+	# run the host rpmdb_dump and restore with the guest rpmdb_load
+	function translate_rpm_hashes () {
+	    set -x
+	    set -e
+	    local personality="$1"; shift
+	    local vserver="$1"; shift
+	    # need to have utilities installed
+	    type -p file
+	    type -p awk
+	    type -p cut
+	    guest_dir=/var/lib/rpm
+	    host_dir=/vservers/$vserver/$guest_dir
+	    files=$(cd $host_dir ; file * | grep Hash | cut -d: -f 1)
+	    for file in $files; do
+		(cd $host_dir && mv $file ${file}-foreign)
+		/usr/lib/rpm/rpmdb_dump $host_dir/${file}-foreign | $personality vserver $VERBOSE $vserver exec /usr/lib/rpm/rpmdb_load $guest_dir/$file
+	    done
+	    $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+	    return 0
+	}
+
+	# try the simple way, if that fails try to cross fix the rpm hashes
+	$personality vserver $VERBOSE $vserver exec rpm --rebuilddb || translate_rpm_hashes $personality $vserver
+    fi
 
     # check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support
     need_vdevmap=$(grep "CONFIG_VSERVER_DEVICE=y" /boot/config-$(uname -r) | wc -l)