summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-05-13 02:30:28 +0200
committerAaron Griffin <aaron@archlinux.org>2006-05-13 02:30:28 +0200
commite266d309b8f8583c823eb894f91d0cfa4fe28092 (patch)
tree2cf9516e913ad6d2570a8df6c6b00b5b90d4672d
parent3a000448640543e647497e022a40362cbacc3c6b (diff)
downloadmkinitcpio-e266d309b8f8583c823eb894f91d0cfa4fe28092.tar.gz
mkinitcpio-e266d309b8f8583c823eb894f91d0cfa4fe28092.tar.xz
Modify /tmp handling when basedir is specified
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@99 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--mkinitcpio10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkinitcpio b/mkinitcpio
index c502354..45b6b1a 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -138,12 +138,12 @@ done
if [ "${HAS_MODULES}" == "y" ]; then
echo ":: Generating module dependancies"
- [ -e /tmp${MODULEDIR}/ ] && rm -rf /tmp${MODULEDIR}/
- cp --parents $(grep "file /lib/modules" ${FILELIST} | awk '{print $2}') /tmp/
+ [ -e /tmp/lib/modules/${KERNELVERSION}/ ] && rm -r /tmp/lib/modules/${KERNELVERSION}/
+ cp -r --parents $(grep "file /lib/modules" ${FILELIST} | awk '{print $2}') /tmp/
depmod -b /tmp ${KERNELVERSION}
- add_file /tmp${MODULEDIR}/modules.dep ${MODULEDIR}/modules.dep
- add_file /tmp${MODULEDIR}/modules.alias ${MODULEDIR}/modules.alias
- add_file /tmp${MODULEDIR}/modules.symbols ${MODULEDIR}/modules.symbols
+ add_file /tmp/lib/modules/${KERNELVERSION}/modules.dep ${MODULEDIR}/modules.dep
+ add_file /tmp/lib/modules/${KERNELVERSION}/modules.alias ${MODULEDIR}/modules.alias
+ add_file /tmp/lib/modules/${KERNELVERSION}/modules.symbols ${MODULEDIR}/modules.symbols
fi
if [ "x$GENIMG" != "x" ]; then