projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve portability of linux headers cleanup inside grml_cleanup_chroot
[grml-live.git]
/
etc
/
grml
/
fai
/
grml
/
grml_cleanup_chroot
diff --git
a/etc/grml/fai/grml/grml_cleanup_chroot
b/etc/grml/fai/grml/grml_cleanup_chroot
index
be7bc6b
..
6d75ea1
100755
(executable)
--- a/
etc/grml/fai/grml/grml_cleanup_chroot
+++ b/
etc/grml/fai/grml/grml_cleanup_chroot
@@
-54,7
+54,17
@@
eend $?
if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
einfo "Cleaning up /usr/src/linux-headers-$KERNEL"
if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
einfo "Cleaning up /usr/src/linux-headers-$KERNEL"
- ( cd /usr/src && make clean && make symlinks )
+ ( cd /usr/src
+ VER=$(/bin/ls -d /usr/src/linux-headers-* | head -1)
+ VER=${VER##/usr/src/linux-headers-}
+ if [ -n "$VER" ] ; then
+ VER=$VER make clean && \
+ VER=$VER make symlinks
+ else
+ make clean && \
+ make symlinks
+ fi
+ )
eend $?
fi
eend $?
fi
@@
-64,8
+74,7
@@
elif [ -n "$GRML64" ] ; then
if [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
einfo "grml64 detected, assuming /usr/src/linux-headers-$KERNEL is ok." ; eend 0
else
if [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
einfo "grml64 detected, assuming /usr/src/linux-headers-$KERNEL is ok." ; eend 0
else
- eerror "/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 1
- exit 10
+ ewarn "/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
fi
elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
eerror "/usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ - error"
fi
elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
eerror "/usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ - error"