summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2007-10-31 09:41:10 +0100
committerThomas Bächler <thomas@archlinux.org>2007-10-31 09:41:10 +0100
commit3fce4e1e1c8aa3c3d53836f89cf5c6253796f5e6 (patch)
tree1fc1d34f0080b640241736b383f5ccae93fa2f0e
parent8a47fa9512eb355e8f7cbe4b4e7d28373e706a6c (diff)
downloadmkinitcpio-3fce4e1e1c8aa3c3d53836f89cf5c6253796f5e6.tar.gz
mkinitcpio-3fce4e1e1c8aa3c3d53836f89cf5c6253796f5e6.tar.xz
Fix problems with /sbin and /usr/sbin not being in the path,
fixes Archlinux #8448
-rw-r--r--install/autodetect2
-rw-r--r--mkinitcpio8
2 files changed, 7 insertions, 3 deletions
diff --git a/install/autodetect b/install/autodetect
index eba31d3..2ae8db6 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -30,7 +30,7 @@ install ()
done
if [ -e /sbin/mdadm ]; then
- for raidmod in $(mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* /dev/cciss/* /dev/ataraid/* \
+ for raidmod in $(/sbin/mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* /dev/cciss/* /dev/ataraid/* \
| awk -Flevel= '{print $2}' | awk '{print $1}'); do
case "${raidmod}" in
raid4|raid5|raid6)
diff --git a/mkinitcpio b/mkinitcpio
index 841659b..f6de525 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -32,6 +32,10 @@ PRESETDIR="mkinitcpio.d"
QUIET="y"
SHOW_AUTOMODS="n"
+# Add /{,usr}/sbin to path
+# works around undetected problems like in #8448
+PATH="${PATH}:/sbin:/usr/sbin"
+
APPNAME=$(basename "${0}")
usage ()
@@ -223,7 +227,7 @@ if [ "${HAS_MODULES}" == "y" ]; then
mkdir -p "/tmp/${dir}"
cp "${BASEDIR}${mod}" "/tmp/${dir}/"
done
- depmod -b /tmp ${KERNELVERSION}
+ /sbin/depmod -b /tmp ${KERNELVERSION}
add_file "/tmp/lib/modules/${KERNELVERSION}/modules.dep" "/lib/modules/${KERNELVERSION}/modules.dep"
add_file "/tmp/lib/modules/${KERNELVERSION}/modules.alias" "/lib/modules/${KERNELVERSION}/modules.alias"
add_file "/tmp/lib/modules/${KERNELVERSION}/modules.symbols" "/lib/modules/${KERNELVERSION}/modules.symbols"
@@ -232,7 +236,7 @@ fi
status=0
if [ -n "$GENIMG" ]; then
echo -n ":: Generating image '${GENIMG}'..."
- if ! gen_init_cpio ${FILELIST} | gzip -9 > "${GENIMG}"; then
+ if ! /sbin/gen_init_cpio ${FILELIST} | gzip -9 > "${GENIMG}"; then
echo "FAILED"
status=1
else