From 8ca753a24f8375eac9c8f58a0d793fe66243844b Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Wed, 3 Apr 2013 17:34:25 +0400 Subject: [PATCH] Add support for kernel-genkernel-* files. --- sbin/kernel-clean.sh | 2 +- sbin/kernel-getlast.sh | 5 ++++- sbin/kernel-rebuild.sh | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sbin/kernel-clean.sh b/sbin/kernel-clean.sh index 5197e5b..5e0a206 100755 --- a/sbin/kernel-clean.sh +++ b/sbin/kernel-clean.sh @@ -24,7 +24,7 @@ cd /lib/modules && $NICE_CMD rm -rf `ls | grep -v "^$REVISION$"` # rm old kernel revisions mount -o remount,rw /boot -cd /boot && rm -f `ls System.map-* config-* vmlinuz-* initramfs-* 2>/dev/null | grep -vE "$REVISION$|$REVISION.img$"` +cd /boot && rm -f `ls System.map-* config-* vmlinuz-* kernel-genkernel-* initramfs-* 2>/dev/null | grep -vE "$REVISION$|$REVISION.img$"` mount -o remount,ro -force /boot # rm old sources diff --git a/sbin/kernel-getlast.sh b/sbin/kernel-getlast.sh index 15a00c0..225735d 100755 --- a/sbin/kernel-getlast.sh +++ b/sbin/kernel-getlast.sh @@ -54,7 +54,10 @@ kernel-clean.sh vmlinuz_file=/boot/`echo $new_kernel | sed 's~^linux~vmlinuz~'` [ "" == "$vmlinuz_file" ] && echo "vmlinuz_file == \"\"" && exit -1 -if [[ ! -f "$vmlinuz_file" || 1 -eq $FORCE_REBUILD ]]; then +genkernel_file=/boot/`echo $new_kernel | sed 's~^linux~kernel-genkernel~'` +[ "" == "$genkernel_file" ] && echo "genkernel_file == \"\"" && exit -1 + +if [[ ! -f "$vmlinuz_file" && ! -f "$genkernel_file" || 1 -eq $FORCE_REBUILD ]]; then kernel-rebuild.sh $KERNEL_REBUILD_ARGS [ 0 -ne $? ] && echo "kernel-rebuild.sh $KERNEL_REBUILD_ARGS failed" && exit -1 fi diff --git a/sbin/kernel-rebuild.sh b/sbin/kernel-rebuild.sh index 5187f92..7dcfd9e 100755 --- a/sbin/kernel-rebuild.sh +++ b/sbin/kernel-rebuild.sh @@ -100,6 +100,8 @@ fi [ -f /boot/grub/grub.conf ] && \ sed -i "s~\/boot\/vmlinuz-[0-9][^ ]*~\/boot\/vmlinuz-$REVISION~g; + s~\/boot\/kernel-genkernel-x86_64-[0-9][^]*~\/boot\/kernel-genkernel-x86_64-$REVISION~g; + s~\/boot\/kernel-genkernel-x86-[0-9][^]*~\/boot\/kernel-genkernel-x86-$REVISION~g; s~\/boot\/initramfs-[0-9][^ ]*~\/boot\/initramfs-$REVISION.img~g" \ /boot/grub/grub.conf