projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches
[grml-live-grml.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
fac52ad
..
b75f55a
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,14
+74,14
@@
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
- ewarn "/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
+ ewarn "
Warning:
/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
fi
elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
fi
elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
- e
error "/usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ - error
"
- e
end 1
- e
xit 1
0
+ e
warn "Warning: /usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ (possible an error)
"
+ e
warn "Common reason: you forgot to install linux-kernel-headers-grml and use linux-libc-dev instead"
+ e
end
0
else
else
- ewarn "linux-headers-$KERNEL not installed." ; eend 0
+ ewarn "
Warning:
linux-headers-$KERNEL not installed." ; eend 0
fi
einfo "Creating ~/.zshrc"
fi
einfo "Creating ~/.zshrc"