kadischi/livecd_generator livecd-mkinitrd.sh,1.25,1.26

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19968/kadischi/livecd_generator

Modified Files:
	livecd-mkinitrd.sh 
Log Message:
Fix up x86_64 condition a bit more for initramfs


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- livecd-mkinitrd.sh	29 Aug 2006 03:04:13 -0000	1.25
+++ livecd-mkinitrd.sh	29 Aug 2006 14:32:04 -0000	1.26
@@ -73,6 +73,12 @@
     cp $1 $2
 }
 
+getarch() {
+    if [ -x /bin/rpm ]; then        
+        arch=$(/bin/rpm --root $rootdir -q --queryformat "%{ARCH}\n" kernel)
+    fi
+}
+
 while [ $# -gt 0 ]; do
     case $1 in
         --version)
@@ -154,13 +160,7 @@
 done
 
 
-echo $kernel | grep FC5 >/dev/null
-if [ "$?" -eq "0" ]; then
-    /bin/dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1
-else
-    IMAGESIZE=2500
-    /bin/dd if=/dev/zero of=$IMAGE bs=4k count=$IMAGESIZE 2> /dev/null || exit 1
-fi
+/bin/dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1
 LODEV=$(losetup -f)
 
 if [ -z "$LODEV" ]; then
@@ -175,12 +175,7 @@
 # We have to "echo y |" so that it doesn't complain about $IMAGE not
 # being a block device
 # We also use -b 4096 to rectify issue: BZ #202715
-echo $kernel | grep FC5 >/dev/null
-if [ "$?" -eq "0" ]; then
-    echo y | /sbin/mke2fs -b 1024 $LODEV $IMAGESIZE >/dev/null 2>/dev/null
-else
-    echo y | /sbin/mke2fs -b 4096 $LODEV $IMAGESIZE >/dev/null 2>/dev/null
-fi
+echo y | /sbin/mke2fs -b 1024 $LODEV $IMAGESIZE >/dev/null 2>/dev/null
 
 
 /sbin/tune2fs -i0 $LODEV >/dev/null
@@ -196,6 +191,7 @@
 }
 
 /bin/mkdir -p $MNTIMAGE/lib
+/bin/mkdir -p $MNTIMAGE/lib64
 /bin/mkdir -p $MNTIMAGE/lib/tls
 /bin/mkdir -p $MNTIMAGE/lib/modules/$kernel
 /bin/mkdir -p $MNTIMAGE/bin
@@ -218,27 +214,53 @@
 # /bin/rm -rf $MNTPOINT/lost+found
 cp $rootdir/etc/makedev.d/* $MNTIMAGE/etc/makedev.d
 
-inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2"
-inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1"
-inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1"
-inst $rootdir/lib/libdl.so.2 "$MNTIMAGE/lib/libdl.so.2"
+getarch
+if [ "$arch" == "i686" ] || [ "$arch" == "i586" ]; then
+    inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2"
+    inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1"
+    inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1"
+    inst $rootdir/lib/libdl.so.2 "$MNTIMAGE/lib/libdl.so.2"
+    
+    if [ -f $rootdir/lib/tls/libc.so.6 ]; then
+        inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
+    else
+        inst $rootdir/lib/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
+    fi
 
-if [ -f $rootdir/lib/tls/libc.so.6 ]; then
-    inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
-else
-    inst $rootdir/lib/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
-fi
+    if [ -f $rootdir/lib/tls/libm.so.6 ]; then
+        inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
+    else
+        inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
+        /bin/ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
+    fi
 
-if [ -f $rootdir/lib/tls/libm.so.6 ]; then
-    inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
+    if [ -f $rootdir/lib/libcrypt.so.1 ]; then
+        inst $rootdir/lib/libcrypt.so.1 "$MNTIMAGE/lib/libcrypt.so.1"
+    fi
 else
-    inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
-    /bin/ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
-fi
+    inst $rootdir/lib64/ld-linux.so.2 "$MNTIMAGE/lib64/ld-linux.so.2"
+    inst $rootdir/lib64/libselinux.so.1 "$MNTIMAGE/lib64/libselinux.so.1"
+    inst $rootdir/lib64/libsepol.so.1 "$MNTIMAGE/lib64/libsepol.so.1"
+    inst $rootdir/lib64/libdl.so.2 "$MNTIMAGE/lib64/libdl.so.2"
+
+    if [ -f $rootdir/lib64/tls/libc.so.6 ]; then
+        inst $rootdir/lib64/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
+    else
+        inst $rootdir/lib64/libc.so.6 "$MNTIMAGE/lib64/libc.so.6"
+    fi
+
+    if [ -f $rootdir/lib64/tls/libm.so.6 ]; then
+        inst $rootdir/lib64/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
+    else
+        inst $rootdir/lib64/libm.so.6 "$MNTIMAGE/lib64/libm.so.6"
+        /bin/ln -s "/lib64/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
+    fi
 
-if [ -f $rootdir/lib/libcrypt.so.1 ]; then
-    inst $rootdir/lib/libcrypt.so.1 "$MNTIMAGE/lib/libcrypt.so.1"
+    if [ -f $rootdir/lib64/libcrypt.so.1 ]; then
+        inst $rootdir/lib64/libcrypt.so.1 "$MNTIMAGE/lib64/libcrypt.so.1"
+    fi
 fi
+    
 
 # Install NASH
 inst /sbin/nash "$MNTIMAGE/bin/nash"