Merge branch 'master' into storage

Conflicts:
	anaconda
	fsset.py
	iutil.py
	iw/partition_gui.py
	partedUtils.py

5 files changed, 32 insertions, 19 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 3c59a3157..ab8d2df49 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -179,6 +179,9 @@ echo "Running buildinstall..."
 
 pushd $BUILDINSTDIR
 BUILDARCH=`repoquery -c $yumconf --qf "%{ARCH}\n" anaconda`
+# This is a crappy implementation but x86 is the only place we currently see
+# BUILDARCH != BASEARCH (e.g. i586 != i386) so it'll suffice.
+BASEARCH=`echo $BUILDARCH | sed -e 's/i.86/i386/'`
 yumdownloader -c $yumconf anaconda || exit 1
 rpm2cpio anaconda*rpm | cpio --quiet -iumd './usr*'
 rm -f anaconda*rpm
@@ -212,11 +215,12 @@ echo "Building images..."
 $UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf || die "upd-instroot failed"
 
 echo "Writing .treeinfo file..."
-$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo
+# NOTE --arch must match MK_IMAGES or the resulting treeinfo will be invalid
+$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo
 
 # FIXME: need to update mk-images to take the yumconf
 echo "Making images..."
-$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed"
+$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed"
 
 echo "Writing .discinfo file"
 $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL"  --outfile=$OUTPUT/.discinfo
diff --git a/scripts/mk-images b/scripts/mk-images
index d86da0a77..d4cac465f 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -30,7 +30,7 @@ usage () {
 }
 
 DEBUG=""
-BUILDARCH=`uname -m | sed -e 's/i.86/i386/'`
+BUILDARCH=`uname -m`
 BOOTISO="boot.iso"
 
 while [ $# -gt 0 ]; do
@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
             shift
         ;;
         --arch)
-            BUILDARCH=`echo $2 | sed -e 's/i.86/i386/'`
+            BUILDARCH=$2
             shift; shift
         ;;
         --imgdir)
@@ -96,7 +96,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
 
 # modules that are needed.  this is the generic "needed for every arch" stuff
 COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci"
-USBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage sd_mod sr_mod ub appletouch"
+USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch"
 FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci"
 SDMODS="mmc-block sdhci sdhci-pci"
 IDEMODS="ide-cd ide-cd_mod"
@@ -810,8 +810,8 @@ makemainimage () {
             ERROR=$(du -sk $IMGPATH/usr/lib/anaconda-runtime | awk '{ print $1 }')
             SIZE=$(expr $SIZE - $ERROR)
         fi
-        if [ -d $IMGPATH/usr/lib/syslinux ]; then
-            ERROR=$(du -sk $IMGPATH/usr/lib/syslinux | awk '{ print $1 }')
+        if [ -d $IMGPATH/usr/share/syslinux ]; then
+            ERROR=$(du -sk $IMGPATH/usr/share/syslinux | awk '{ print $1 }')
             SIZE=$(expr $SIZE - $ERROR)
         fi
         dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null
@@ -821,7 +821,7 @@ makemainimage () {
 
         (cd $IMGPATH; find . |
             fgrep -v "./usr/lib/anaconda-runtime" |
-            fgrep -v "./usr/lib/syslinux"
+            fgrep -v "./usr/share/syslinux"
             cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd)
         makeproductfile $mmi_mntpoint
         umount $mmi_mntpoint
diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index 9bd202431..687d76c01 100644
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -157,8 +157,13 @@ prepareEfiTree() {
     mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi
     mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf
 
-    yumdownloader -c $yumconf ${brandpkgname}-logos
-    rpm2cpio $artpkg.rpm | (cd $KERNELROOT; cpio --quiet -iumd)
+    artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1)
+    if [ -z "$artpkg" ]; then
+       argpkg="generic-logos"
+    fi
+
+    yumdownloader -c ${yumconf} ${artpkg}
+    rpm2cpio ${artpkg}.rpm | (cd $KERNELROOT; cpio --quiet -iumd)
     cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz
 }
 
@@ -167,7 +172,7 @@ makeEfiImages() {
     if [ "$kernelvers" != "$kernelxen" ]; then
         local grubarch=${efiarch}
         case ${efiarch} in
-            ia32) grubarch=i386 ;;
+            ia32) grubarch=i?86 ;;
             x64) grubarch=x86_64 ;;
         esac
 
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 3e227395f..813d94185 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SYSLINUX=$IMGPATH/usr/lib/syslinux/syslinux-nomtools
+SYSLINUX=$IMGPATH/usr/share/syslinux/syslinux-nomtools
 
 if [ ! -f $SYSLINUX ]; then
   echo "Warning: nomtools syslinux doesn't exist"
@@ -38,7 +38,7 @@ prepareBootTree() {
 
 	if [ -f $IMGPATH/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg ]; then
 		cp $IMGPATH/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg $MBD_BOOTTREE/splash.jpg
-		cp $IMGPATH/usr/lib/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32
+		cp $IMGPATH/usr/share/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32
 		sed -i s'/default linux/default vesamenu.c32/g' $MBD_BOOTTREE/syslinux.cfg
 		sed -i 's/prompt 1/#prompt 1/g' $MBD_BOOTTREE/syslinux.cfg
 	elif [ -x $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh ]; then
@@ -102,12 +102,12 @@ makeBootImages() {
   [ $? = 0 ] || exit 1
 
   if [ "$kernelvers" != "$kernelxen" ] ; then
-    if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
+    if [ -f $IMGPATH/usr/share/syslinux/isolinux.bin ]; then
 	echo "Building isolinux directory"
 	MBD_BOOTTREE=$TOPDESTPATH/isolinux
 	MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd.img
 	mkdir $MBD_BOOTTREE
-	cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin
+	cp $IMGPATH/usr/share/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin
 
 	prepareBootTree
 
@@ -157,7 +157,11 @@ __EOT__
 
 doPostImages() {
     if [ -n "$BOOTISO" ]; then
-       mkisofs -quiet -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img
+        EFIARGS=""
+        if [ -f isolinux/efiboot.img ]; then
+            EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot"
+        fi
+        mkisofs -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img
        implantisomd5 $TOPDESTPATH/images/$BOOTISO
     fi
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b7dfca23f..1da86f508 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -183,8 +183,8 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
     reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted
     setup slang smc-fonts-meera specspo sqlite synaptics system-config-date
     system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers
-    tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tightvnc-server
-    tightvnc-server-module vlgothic-fonts
+    tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tigervnc-server
+    tigervnc-server-module vlgothic-fonts
     wpa_supplicant xkeyboard-config xfsdump xfsprogs xorg-x11 xorg-x11-auth
     xorg-x11-base xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic
     xorg-x11-fonts-misc xorg-x11-libs xorg-x11-libs-data xorg-x11-server-utils
@@ -512,7 +512,7 @@ usr/lib/python?.?/site-packages/yum
 usr/lib/rpm/macros
 usr/lib/rpm/rpmpopt
 usr/lib/rpm/rpmrc
-usr/lib/syslinux
+usr/share/syslinux
 usr/lib/yaboot
 usr/lib/yum-plugins/blacklist.py*
 usr/lib/yum-plugins/fedorakmod.py*