summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-10-26 13:37:26 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-10-26 13:37:26 +0000
commit1bebc50c6fe40ee6248fce1c860e1d714eafe094 (patch)
tree54a33fa44abafd7e79e279b4d85498e2ea4d237b /app-backup/rear/files
parentVersion bump, remove older (diff)
downloadgentoo-2-1bebc50c6fe40ee6248fce1c860e1d714eafe094.tar.gz
gentoo-2-1bebc50c6fe40ee6248fce1c860e1d714eafe094.tar.bz2
gentoo-2-1bebc50c6fe40ee6248fce1c860e1d714eafe094.zip
Revision bump, support Gentoo kernels; proxied commit for Timo Eissler (morlix), fixes bug #489456.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-backup/rear/files')
-rw-r--r--app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
new file mode 100644
index 000000000000..608685418676
--- /dev/null
+++ b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
@@ -0,0 +1,19 @@
+diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+index 6816f37..ec437e4 100644
+--- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
++++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
+ else
+ Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
+ fi
++ elif [ -f /etc/gentoo-release ]; then
++ if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
++ KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
++ elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
++ KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
++ else
++ Error "Could not find Gentoo kernel"
++ fi
+ else
+ Error "Could not find a matching kernel in /boot !"
+ fi