diff options
author | Thomas Bächler <thomas@archlinux.org> | 2008-03-15 22:31:36 +0100 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2008-03-15 22:31:36 +0100 |
commit | dff86cf5af941ad1478e765641f8f05722b18ae3 (patch) | |
tree | 329172b35547b10fd18a5e4f743fd338e73fddf5 /mkinitcpio | |
parent | 5ce327f59920366b4f43eec12becf484383643ca (diff) | |
download | mkinitcpio-dff86cf5af941ad1478e765641f8f05722b18ae3.tar.gz mkinitcpio-dff86cf5af941ad1478e765641f8f05722b18ae3.tar.xz |
Make presets more powerful: a fallback image can be generated without a separate configuration file
Diffstat (limited to 'mkinitcpio')
-rwxr-xr-x | mkinitcpio | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -119,29 +119,39 @@ if [ -n "${PRESET}" ]; then for p in ${PRESETS[@]}; do echo "==> Building image \"${p}\"" PRESET_CMD="${PRESET_MKOPTS}" + eval "PRESET_KVER=\"\${${p}_kver}\"" + [ -z "${PRESET_KVER}" ] && PRESET_KVER="${ALL_kver}" eval "PRESET_CONFIG=\"\${${p}_config}\"" + [ -z "${PRESET_CONFIG}" ] && PRESET_CONFIG="${ALL_config}" eval "PRESET_IMAGE=\"\${${p}_image}\"" + eval "PRESET_OPTIONS=\"\${${p}_options}\"" + if [ -n "${PRESET_KVER}" ]; then PRESET_CMD="${PRESET_CMD} -k ${PRESET_KVER}" - elif [ -n "${ALL_kver}" ]; then - PRESET_CMD="${PRESET_CMD} -k ${ALL_kver}" else echo "==> No kernel version specified. Skipping image \"${p}\"." continue fi + if [ -n "${PRESET_CONFIG}" ]; then PRESET_CMD="${PRESET_CMD} -c ${PRESET_CONFIG}" else echo "==> No configuration file specified. Skipping image \"${p}\"." continue fi + if [ -n "${PRESET_IMAGE}" ]; then PRESET_CMD="${PRESET_CMD} -g ${PRESET_IMAGE}" else echo "==> No image file specified. Skipping image \"${p}\"." continue fi + + if [ -n "${PRESET_OPTIONS}" ]; then + PRESET_CMD="${PRESET_CMD} ${PRESET_OPTIONS}" + fi + echo "==> Running command: ${PRESET_CMD}" if eval ${PRESET_CMD}; then echo "==> SUCCESS" |