This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / boot / install.sh

diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
index 935bb27..133eae4 100644 (file)
--- a/arch/arm/boot/install.sh
+++ b/arch/arm/boot/install.sh
@@ -21,32 +21,41 @@
 #
 
 # User may have a custom install script
-if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi
-if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi
 
-if [ "$(basename $2)" = "zImage" ]; then
+if [ -x /sbin/installkernel ]; then
+  exec /sbin/installkernel "$@"
+fi
+
+if [ "$2" = "zImage" ]; then
 # Compressed install
   echo "Installing compressed kernel"
-  base=vmlinuz
+  if [ -f $4/vmlinuz-$1 ]; then
+    mv $4/vmlinuz-$1 $4/vmlinuz.old
+  fi
+
+  if [ -f $4/System.map-$1 ]; then
+    mv $4/System.map-$1 $4/System.old
+  fi
+
+  cat $2 > $4/vmlinuz-$1
+  cp $3 $4/System.map-$1
 else
 # Normal install
   echo "Installing normal kernel"
-  base=vmlinux
-fi
+  if [ -f $4/vmlinux-$1 ]; then
+    mv $4/vmlinux-$1 $4/vmlinux.old
+  fi
 
-if [ -f $4/$base-$1 ]; then
-  mv $4/$base-$1 $4/$base-$1.old
-fi
-cat $2 > $4/$base-$1
+  if [ -f $4/System.map ]; then
+    mv $4/System.map $4/System.old
+  fi
 
-# Install system map file
-if [ -f $4/System.map-$1 ]; then
-  mv $4/System.map-$1 $4/System.map-$1.old
+  cat $2 > $4/vmlinux-$1
+  cp $3 $4/System.map
 fi
-cp $3 $4/System.map-$1
 
 if [ -x /sbin/loadmap ]; then
-  /sbin/loadmap
+  /sbin/loadmap --rdev /dev/ima
 else
   echo "You have to install it yourself"
 fi