From 5796d137c2df35b1db8adbe74809f17d8de070fd Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 25 Apr 2014 12:00:34 +0200
Subject: [PATCH] Fixes for rpm database problem when doing cross x86/x86_64
 installations Fixes: error: db4 error(-30986) from dbcursor->get:
 DB_PAGE_NOTFOUND: Requested page not found

---
 platforms/livecd-gnome-root/post.inc.sh | 5 +++++
 platforms/livecd-light-root/post.inc.sh | 5 +++++
 platforms/livecd-root/post.inc.sh       | 5 +++++
 platforms/livecd/post.inc.sh            | 2 +-
 platforms/livedvd-root/post.inc.sh      | 5 +++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh
index 8dc7d38..efab007 100644
--- a/platforms/livecd-gnome-root/post.inc.sh
+++ b/platforms/livecd-gnome-root/post.inc.sh
@@ -41,6 +41,11 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
+# clean rpm database before doing other operations with internal rpm
+# to fix cross x86/x86_64 installation error: 
+# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
+clean_rpm_database
+
 # pre-create video drivers for VirtualBox
 virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh
index 9b99b70..2fc0500 100644
--- a/platforms/livecd-light-root/post.inc.sh
+++ b/platforms/livecd-light-root/post.inc.sh
@@ -30,6 +30,11 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
+# clean rpm database before doing other operations with internal rpm
+# to fix cross x86/x86_64 installation error: 
+# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
+clean_rpm_database
+
 # pre-create video drivers for VirtualBox
 virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index 2f3c70c..4e10e8b 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -42,6 +42,11 @@ for f in /usr/share/applications/chromium-devel.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
 done
 
+# clean rpm database before doing other operations with internal rpm
+# to fix cross x86/x86_64 installation error: 
+# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
+clean_rpm_database
+
 # pre-create video drivers for VirtualBox
 virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh
index e7022b4..486ecf5 100644
--- a/platforms/livecd/post.inc.sh
+++ b/platforms/livecd/post.inc.sh
@@ -103,7 +103,7 @@ _EOF
       exit 1; }
 
 # copy syslinux addons to final root /boot dir
-cp $MOUNTDIR/usr/share/syslinux/{ldlinux,libcom32,libutil,vesamenu}.c32 $MOUNTDIR2/boot/isolinux/
+cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
 
 # install memtest
 [ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 258200e..f6816eb 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -42,6 +42,11 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
+# clean rpm database before doing other operations with internal rpm
+# to fix cross x86/x86_64 installation error: 
+# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
+clean_rpm_database
+
 virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    # pre-create video drivers for VirtualBox