- cleanup upgrade path from rpm5

[packages/rpm.git] / dbupgrade.sh

diff --git a/dbupgrade.sh b/dbupgrade.sh
index 52c073af9c15cd9e638e0573e70ecb55f58539f7..30c2d5c902beeb76165b12f55164c14fe855e4c1 100755 (executable)
--- a/dbupgrade.sh
+++ b/dbupgrade.sh
@@ -1,24 +1,36 @@
 #!/bin/sh
 
-if ! /usr/lib/rpm/bin/rpmdb_reset -r lsn /var/lib/rpm/Packages ; then
+ROOTDIR=
+if [ "$1" = "-r" ]; then
+       shift
+       ROOTDIR="$1"
+
+       if [ ! -d "$ROOTDIR" ]; then
+               echo "Specified root directory ($ROOTDIR) does not exist!"
+               echo "Bailing out!"
+               exit
+       fi
+fi
+
+if ! /usr/lib/rpm/rpmdb_reset -r lsn "$ROOTDIR"/var/lib/rpm/Packages ; then
        echo
        echo "rpm database conversion failed!"
        echo
        echo "You have to run:"
        echo
-       echo "  /usr/lib/rpm/bin/rpmdb_reset -r lsn /var/lib/rpm/Packages"
+       echo "  /usr/lib/rpm/rpmdb_reset -r lsn /var/lib/rpm/Packages"
        echo "  /bin/rm -f /var/lib/rpm/__db.00*"
        echo "  /bin/rm -f /var/lib/rpm/log/*"
-       echo "  /usr/lib/rpm/bin/dbconvert --rebuilddb"
+       echo "  /usr/bin/rpmdb --rebuilddb"
        echo
 else
-       /bin/rm --interactive=never -f /var/lib/rpm/__db.00* >/dev/null 2>/dev/null || :
-       /bin/rm --interactive=never -f /var/lib/rpm/log/* >/dev/null 2>/dev/null || :
+       /bin/rm --interactive=never -f "$ROOTDIR"/var/lib/rpm/__db.00* >/dev/null 2>/dev/null || :
+       /bin/rm --interactive=never -f "$ROOTDIR"/var/lib/rpm/log/* >/dev/null 2>/dev/null || :
 
-       if ! /usr/lib/rpm/bin/dbconvert --rebuilddb; then
+       if ! /usr/bin/rpmdb --rebuilddb ${ROOTDIR:+--root="$ROOTDIR"}; then
                echo
                echo "rpm database conversion failed!"
-               echo "You have to run /usr/lib/rpm/bin/dbconvert manually"
+               echo "You have to run /usr/bin/rpmdb manually"
                echo
        fi
 fi