Attachment 146593 Details for Bug 224438 – Patch against anaconda 11.1.1.3

[patch] Patch against anaconda 11.1.1.3

anaconda-tmpdir.patch (text/plain), 11.16 KB, created by Steven Pritchard on 2007-01-25 18:13:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Pritchard

Created: 2007-01-25 18:13:40 UTC

Size: 11.16 KB

patch

obsolete

>diff -urN anaconda-11.1.1.3.orig/scripts/buildinstall anaconda-11.1.1.3/scripts/buildinstall
>--- anaconda-11.1.1.3.orig/scripts/buildinstall	2006-08-08 20:51:35.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/buildinstall	2007-01-25 09:41:53.000000000 -0600
>@@ -97,7 +97,7 @@
>     rm -rf $BUILDINSTDIR
>     mkdir -p $BUILDINSTDIR
> fi
>-TREEDIR=/tmp/treedir.$$
>+TREEDIR=${TMPDIR:-/tmp}/treedir.$$
> 
> UPD_INSTROOT=$BUILDINSTDIR/upd-instroot
> MK_IMAGES=$BUILDINSTDIR/mk-images
>diff -urN anaconda-11.1.1.3.orig/scripts/getkeymaps anaconda-11.1.1.3/scripts/getkeymaps
>--- anaconda-11.1.1.3.orig/scripts/getkeymaps	2004-05-19 20:00:03.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/getkeymaps	2007-01-25 09:45:02.000000000 -0600
>@@ -9,8 +9,8 @@
> TOPDIR=`pwd`
> OUTPUT=$2
> if [ -z "$OUTPUT" ]; then
>-    echo "No output specified, using /tmp/keymaps-$ARCH.$$"
>-    OUTPUT=/tmp/keymaps-$ARCH.$$
>+    echo "No output specified, using ${TMPDIR:-/tmp}/keymaps-$ARCH.$$"
>+    OUTPUT=${TMPDIR:-/tmp}/keymaps-$ARCH.$$
> fi
> 
> UTILDIR=$3
>@@ -22,10 +22,10 @@
>     MAPSHDR=$UTILDIR/usr/lib/anaconda-runtime/mapshdr
> fi
> 
>-TMPDIR=/tmp/keymaps.$$
>+TMP=${TMPDIR:-/tmp}/keymaps.$$
> 
>-rm -rf $TMPDIR
>-mkdir -p $TMPDIR
>+rm -rf $TMP
>+mkdir -p $TMP
> 
> if [ $ARCH = "sparc" ]; then
>     PATTERN={i386,sun}
>@@ -38,14 +38,14 @@
> for map in $MAPS ; do 
>  eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*" | while read n; do
>     /bin/loadkeys `basename $n .gz` >/dev/null
>-    $READMAP $TMPDIR/`basename $n .map.gz`.map
>+    $READMAP $TMP/`basename $n .map.gz`.map
>   done
> done
> 
> loadkeys us
> 
>-rm -f $TMPDIR/defkeymap* $TMPDIR/ANSI* $TMPDIR/lt.map
>+rm -f $TMP/defkeymap* $TMP/ANSI* $TMP/lt.map
> 
>-(cd $TMPDIR; $MAPSHDR *.map) > $TMPDIR/hdr
>-cat $TMPDIR/hdr $TMPDIR/*.map | gzip -9 > $OUTPUT
>-rm -rf $TMPDIR
>+(cd $TMP; $MAPSHDR *.map) > $TMP/hdr
>+cat $TMP/hdr $TMP/*.map | gzip -9 > $OUTPUT
>+rm -rf $TMP
>diff -urN anaconda-11.1.1.3.orig/scripts/mk-images anaconda-11.1.1.3/scripts/mk-images
>--- anaconda-11.1.1.3.orig/scripts/mk-images	2006-10-01 17:48:54.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/mk-images	2007-01-25 09:49:44.000000000 -0600
>@@ -3,6 +3,7 @@
> 
> PATH=$PATH:/sbin:/usr/sbin
> IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i)
>+TMPDIR=${TMPDIR:-/tmp}
> 
> usage () {
> 	echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
>@@ -54,12 +55,12 @@
>     KERNELPATH=$1
>     TOPDESTPATH=$2
>     IMAGEPATH=$TOPDESTPATH/images
>-    FULLMODPATH=/tmp/instimagemods.$$
>+    FULLMODPATH=$TMPDIR/instimagemods.$$
>     FINALFULLMODPATH=$4/modules
>     INSTIMGPATH=$TOPDESTPATH/images
>     INSTIMGTEMPLATE=$3
>     IMGPATH=$4
>-    KERNELBASE=/tmp/updboot.kernel.$$
>+    KERNELBASE=$TMPDIR/updboot.kernel.$$
>     MODDEPS=$KERNELBASE/moddeps
>     MODALIAS=$KERNELBASE/modules.alias
>     BUILDARCH=$5
>@@ -109,7 +110,7 @@
>     TRIMPCIIDS=$IMGPATH/usr/lib/anaconda-runtime/trimpciids
>     GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
>     GENINITRDSZ=$IMGPATH/usr/lib/anaconda-runtime/geninitrdsz
>-    KEYMAPS=/tmp/keymaps-$BUILDARCH.$$
>+    KEYMAPS=$TMPDIR/keymaps-$BUILDARCH.$$
>     SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz
>     GETMODDEPS=$IMGPATH/usr/lib/anaconda-runtime/moddeps
>     MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist
>@@ -263,14 +264,14 @@
> 	    NAME=$(echo $name | cut -c2-)
> 
> 	    # all of the modules of this type
>-	    $MODLIST --modinfo-file $MODINFO $NAME > /tmp/emsAll.$$
>+	    $MODLIST --modinfo-file $MODINFO $NAME > $TMPDIR/emsAll.$$
> 	    # the modules used that are of this type
>-	    sort -u $MODULESUSED | cat - /tmp/emsAll.$$ | sort | 
>-		    uniq -d > /tmp/emsUsed.$$
>+	    sort -u $MODULESUSED | cat - $TMPDIR/emsAll.$$ | sort | 
>+		    uniq -d > $TMPDIR/emsUsed.$$
> 	    # the modules that are of this type, but not used
>-	    SET="$SET $(cat /tmp/emsAll.$$ /tmp/emsUsed.$$ | sort | uniq -u)"
>+	    SET="$SET $(cat $TMPDIR/emsAll.$$ $TMPDIR/emsUsed.$$ | sort | uniq -u)"
> 
>-	    rm -f /tmp/emsAll.$$ /tmp/emsUsed.$$
>+	    rm -f $TMPDIR/emsAll.$$ $TMPDIR/emsUsed.$$
> 	else
> 	    SET="$SET $name"
> 	fi
>@@ -571,9 +572,9 @@
> 	exit 1
>     fi
> 
>-    MBD_DIR=/tmp/makebootdisk.dir.$$
>-    MBD_FSIMAGE=/tmp/makebootdisk.initrdimage.$$
>-    MBD_BOOTTREE=/tmp/makebootdisk.tree.$$
>+    MBD_DIR=$TMPDIR/makebootdisk.dir.$$
>+    MBD_FSIMAGE=$TMPDIR/makebootdisk.initrdimage.$$
>+    MBD_BOOTTREE=$TMPDIR/makebootdisk.tree.$$
> 
>     rm -rf $MBD_DIR MBD_FSIMAGE
>     mkdir -p $MBD_DIR/modules
>@@ -583,7 +584,7 @@
>     mkdir -p $MBD_DIR/proc
>     mkdir -p $MBD_DIR/selinux
>     mkdir -p $MBD_DIR/sys
>-    mkdir -p $MBD_DIR/tmp
>+    mkdir -p $MBD_DIR$TMPDIR
>     mkdir -p $MBD_DIR/etc/terminfo/{a,b,d,l,s,v,x}
>     mkdir -p $MBD_DIR/var/state
>     mkdir -p $MBD_DIR/var/run
>@@ -598,7 +599,7 @@
> 	mkdir -p $MBD_DIR/etc/{pam.d,security}
> 	mkdir -p $MBD_DIR/$LIBDIR/security
> 	cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0
>-	ln -s /tmp $MBD_DIR/var/state/xkb
>+	ln -s $TMPDIR $MBD_DIR/var/state/xkb
> 	cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
>         cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
>     fi
>@@ -652,7 +653,7 @@
>     ln -s /proc/mounts $MBD_DIR/etc/mtab
>     ln -s sbin $MBD_DIR/bin
>     mkdir -p $MBD_DIR/var/lib
>-    ln -s ../../tmp $MBD_DIR/var/lib/xkb
>+    ln -s ../..$TMPDIR $MBD_DIR/var/lib/xkb
> 
>     # s390/s390x need sshd/telnet setup
>     if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
>@@ -684,35 +685,35 @@
> makeinstimage () {
>     imagename=$1
>     type=$2
>-    tmpdir=/tmp/instimage.dir.$$
>+    tmp=$TMPDIR/instimage.dir.$$
> 
>-    rm -rf $tmpimage $tmpdir
>-    mkdir -p $mntpoint $tmpdir
>+    rm -rf $tmpimage $tmp
>+    mkdir -p $mntpoint $tmp
> 
>-    mkdir -p $tmpdir
>-    (cd $INSTIMGTEMPLATE; find . | cpio --quiet -p $tmpdir)
>-    makeproductfile $tmpdir
>+    mkdir -p $tmp
>+    (cd $INSTIMGTEMPLATE; find . | cpio --quiet -p $tmp)
>+    makeproductfile $tmp
> 
>     if [ -z "$type" -o "$type" = "cramfs" ]; then 
>-        echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img"
>-        mkfs.cramfs $CRAMBS $tmpdir /tmp/${imagename}2.img.$$
>+        echo "Running mkcramfs $CRAMBS $tmp $INSTIMGPATH/${imagename}2.img"
>+        mkfs.cramfs $CRAMBS $tmp $TMPDIR/${imagename}2.img.$$
>     elif [ "$type" = "squashfs" ]; then
>-        echo "Running mksquashfs $tmpdir /tmp/${imagename}2.img -all-root -no-fragments"
>-        mksquashfs $tmpdir /tmp/${imagename}2.img.$$ -all-root -no-fragments
>-        chmod 0644 /tmp/${imagename}2.img.$$
>+        echo "Running mksquashfs $tmp $TMPDIR/${imagename}2.img -all-root -no-fragments"
>+        mksquashfs $tmp $TMPDIR/${imagename}2.img.$$ -all-root -no-fragments
>+        chmod 0644 $TMPDIR/${imagename}2.img.$$
>     fi
>-    cp /tmp/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
>+    cp $TMPDIR/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
>     size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}')
>     size=$(expr $size / 1024)
>     echo "Wrote $INSTIMGPATH/${imagename}2.img (${size}k)..."
>-    rm -rf $tmpdir
>+    rm -rf $tmp
> }
> 
> makemainimage () {
>     imagename=$1
>     type=$2
>-    mmi_tmpimage=/tmp/instimage.img.$$
>-    mmi_mntpoint=/tmp/instimage.mnt.$$
>+    mmi_tmpimage=$TMPDIR/instimage.img.$$
>+    mmi_mntpoint=$TMPDIR/instimage.mnt.$$
>     
>     rm -rf $mmi_tmpimage $mmi_mntpoint
>     mkdir $mmi_mntpoint
>diff -urN anaconda-11.1.1.3.orig/scripts/mk-images.ia64 anaconda-11.1.1.3/scripts/mk-images.ia64
>--- anaconda-11.1.1.3.orig/scripts/mk-images.ia64	2006-08-29 09:14:53.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/mk-images.ia64	2007-01-25 09:50:31.000000000 -0600
>@@ -6,8 +6,8 @@
>     INITRDFLAGS=""
>     MBD_FILENAME=""
>     INITRDFILE=""
>-    MBD_TMPIMAGE=/tmp/makebootdisk.image.$$
>-    MBD_BOOTTREE=/tmp/makebootdisk.tree.$$
>+    MBD_TMPIMAGE=${TMPDIR:-/tmp}/makebootdisk.image.$$
>+    MBD_BOOTTREE=${TMPDIR:-/tmp}/makebootdisk.tree.$$
>     MBD_BOOTTREE_TMP=$MBD_BOOTTREE'_tmp'
>     while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
> 	if [ $1 = "--kernelto" ]; then
>diff -urN anaconda-11.1.1.3.orig/scripts/pkgorder anaconda-11.1.1.3/scripts/pkgorder
>--- anaconda-11.1.1.3.orig/scripts/pkgorder	2006-10-02 16:23:59.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/pkgorder	2007-01-25 10:30:03.000000000 -0600
>@@ -153,7 +153,11 @@
>     else:
>         printMatchingPkgs("%s/%s" % (toppath, "kernel-*"))        
> 
>-    testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
>+    if os.environ.has_key('TMPDIR'):
>+        testpath = "%s/pkgorder-%d" %(os.environ['TMPDIR'],os.getpid(),)
>+    else:
>+        testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
>+
>     os.system("mkdir -p %s/var/lib/rpm" %(testpath,))
>     
>     ds = PackageOrderer(arch=arch)
>diff -urN anaconda-11.1.1.3.orig/scripts/upd-instroot anaconda-11.1.1.3/scripts/upd-instroot
>--- anaconda-11.1.1.3.orig/scripts/upd-instroot	2006-10-04 16:48:30.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/upd-instroot	2007-01-25 10:32:15.000000000 -0600
>@@ -93,13 +93,13 @@
> }
> 
> if [ -z "$2" ]; then
>-    DEST=/tmp/upd-instroot
>+    DEST=${TMPDIR:-/tmp}/upd-instroot
> else
>     DEST=$2
> fi
> 
> if [ -z "$3" ]; then
>-    DESTGR=/tmp/upd-instroot
>+    DESTGR=${TMPDIR:-/tmp}/upd-instroot
> else
>     DESTGR=$3
> fi
>@@ -254,7 +254,7 @@
> # It also is the base on which the other install images build on top of,
> # so if something is needed by all images it should go here
> #
>-KEEPFILE=/tmp/keepfile.$$
>+KEEPFILE=${TMPDIR:-/tmp}/keepfile.$$
> 
> cat > $KEEPFILE <<EOF
> boot/efi/EFI/redhat/elilo.efi
>@@ -559,7 +559,7 @@
> # by KEEPFILERESCUE below.  The total size of this image should be
> # under the size of the miniature CD used for the rescue CD (around 68MB).
> #
>-KEEPFILEGR=/tmp/keepfilegr.$$
>+KEEPFILEGR=${TMPDIR:-/tmp}/keepfilegr.$$
> cp $KEEPFILE $KEEPFILEGR
> cat >> $KEEPFILEGR <<EOF
> boot/efi/EFI/redhat/elilo.efi
>@@ -824,7 +824,7 @@
> # NOTE: hd, ftp, and http rescue mode use and image based on KEEPFILE since
> #       it has to be much smaller due to memory usage.
> #
>-KEEPFILERESCUE=/tmp/keepfilerescue.$$
>+KEEPFILERESCUE=${TMPDIR:-/tmp}/keepfilerescue.$$
> cat > $KEEPFILERESCUE <<EOF
> bin/gunzip
> bin/gzip
>@@ -947,7 +947,7 @@
> expandPackageSet "$RPMSGR" $DESTGR $KEEPFILEGR
> 
> echo "retrieving timezones"
>-TZDIR=/tmp/glibc-timezone-$$
>+TZDIR=${TMPDIR:-/tmp}/glibc-timezone-$$
> mkdir -p $TZDIR/usr/share/zoneinfo
> rpm2cpio $TZDATA | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo ./usr/share/zoneinfo ./usr/share/zoneinfo/* usr/share/zoneinfo/*)
> [ $? = 0 ] || die "ERROR: Unable to expand timezone data ($TZDATA)"
>diff -urN anaconda-11.1.1.3.orig/scripts/yumcache anaconda-11.1.1.3/scripts/yumcache
>--- anaconda-11.1.1.3.orig/scripts/yumcache	2005-10-18 10:54:00.000000000 -0500
>+++ anaconda-11.1.1.3/scripts/yumcache	2007-01-25 10:35:00.000000000 -0600
>@@ -13,8 +13,13 @@
>     """Dynamic yum configuration"""
> 
>     def __init__( self, repopath):
>-        self.fd, self.name = tempfile.mkstemp(".conf", "yum-", "/tmp")
>-	self.cachedir = tempfile.mkdtemp("", "yum-cache-", "/tmp")
>+        if os.environ.has_key('TMPDIR'):
>+            self.fd, self.name = tempfile.mkstemp(".conf", "yum-", os.environ['TMPDIR'])
>+            self.cachedir = tempfile.mkdtemp("", "yum-cache-", os.environ['TMPDIR'])
>+        else:
>+            self.fd, self.name = tempfile.mkstemp(".conf", "yum-", "/tmp")
>+            self.cachedir = tempfile.mkdtemp("", "yum-cache-", "/tmp")
>+
>         self.repopath = repopath
> 
>         self.yumconfstr = """

Actions: View | Diff

Attachments on bug 224438: 146593