git-rb-catchup: fix merge counts

[home.git] / .bin / installkernel

diff --git a/.bin/installkernel b/.bin/installkernel
index 6180eb6f0a8f09ad7f23e679ec6e862b1b7387ed..030e21f0d9203adc9467327731a8292843311b8f 100755 (executable)
--- a/.bin/installkernel
+++ b/.bin/installkernel
@@ -1,7 +1,8 @@
 #!/bin/bash
 # 2.6.35.4-default arch/s390/boot/image System.map /boot
 
-mmv() { [[ -e $1 ]] && mv "$1" "$2" ; }
+e() { echo "+ $*"; "$@"; }
+mmv() { [[ -e $1 ]] && mv "$1" "$2"; }
 
 ver=$1
 img=$2
@@ -9,6 +10,9 @@ map=$3
 dir=$4
 
 mount "${dir}" >&/dev/null
+if [[ ! -w "${dir}" ]] ; then
+       mount "${dir}" -o remount,rw
+fi
 
 case ${img} in
 */blackfin/*)
@@ -29,14 +33,21 @@ case ${img} in
        done
        popd >/dev/null
 
-       rm -f ${dir}/{config,System.map}-${ver}.xz
        cp ${img} ${dir}/image-${ver}
-       cp ${map} ${dir}/System.map-${ver}
-       cp .config ${dir}/config-${ver}
-       xz -9f ${dir}/{config,System.map}-${ver}
+       xz -9c ${map} > ${dir}/System.map-${ver}.xz
+       xz -9c .config > ${dir}/config-${ver}.xz
        ln -sf image-${ver} ${dir}/image
        zipl
        exit 0
        ;;
 esac
-exec /sbin/installkernel "$@"
+
+e /sbin/installkernel "$@"
+
+case ${img} in
+*/x86*/*)
+       if [[ -e ${dir}/grub/grub.cfg ]] ; then
+               e grub-mkconfig -o /boot/grub/grub.cfg
+       fi
+       ;;
+esac