summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2006-12-07 23:47:25 +0100
committerThomas Bächler <thomas@archlinux.org>2006-12-07 23:47:25 +0100
commit41d00818ead4d43ee6dd07e5c9c4690a1f3faeeb (patch)
tree550bee2ad9d2c146864fb819b83b1368f9a9817e
parent6b52dc9fba5ef4cdc6a049e7f35cf3d134da2827 (diff)
downloadmkinitcpio-41d00818ead4d43ee6dd07e5c9c4690a1f3faeeb.tar.gz
mkinitcpio-41d00818ead4d43ee6dd07e5c9c4690a1f3faeeb.tar.xz
reverted partially fucked up commit. should be better now
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@190 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--install/pata2
-rw-r--r--install/sata2
-rw-r--r--mkinitcpio4
3 files changed, 4 insertions, 4 deletions
diff --git a/install/pata b/install/pata
index 88a0634..c3da76f 100644
--- a/install/pata
+++ b/install/pata
@@ -7,7 +7,7 @@ install ()
MODULES=$(echo ${MODULES}) #trim whitespace
if [ "x${MODULES}" != "x" ]; then
- MODULES="${MODULES} libata sd_mod sr_mod"
+ MODULES="${MODULES} sd_mod sr_mod"
fi
BINARIES=""
diff --git a/install/sata b/install/sata
index f8c6bd8..61f7dda 100644
--- a/install/sata
+++ b/install/sata
@@ -9,7 +9,7 @@ install ()
MODULES=$(echo ${MODULES}) #trim whitespace
if [ "x${MODULES}" != "x" ]; then
- MODULES="${MODULES} libata sd_mod sr_mod"
+ MODULES="${MODULES} sd_mod sr_mod"
fi
BINARIES=""
diff --git a/mkinitcpio b/mkinitcpio
index ace6b77..db0b773 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -92,7 +92,7 @@ if [ -n "${PRESET}" ]; then
# Use -b, -m and -v options specified earlier
PRESET_MKOPTS="${0}"
[ -n "${BASEDIR}" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -b ${BASEDIR}"
- [ -n "${MESSAGE}" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -m ${MESSAGE}"
+ [ -n "${MESSAGE}" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -m \"${MESSAGE}\""
[ "${QUIET}" = "n" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -v"
# Build all images
source ${PRESETDIR}/${PRESET}.preset
@@ -123,7 +123,7 @@ if [ -n "${PRESET}" ]; then
continue
fi
echo "==> Running command: ${PRESET_CMD}"
- if ${PRESET_CMD}; then
+ if eval ${PRESET_CMD}; then
echo "==> SUCCESS"
else
echo "==> FAIL"