summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-03 19:38:38 +0100
committerDave Reisner <dreisner@archlinux.org>2012-03-04 17:59:39 +0100
commitb9c0480fcd37bf021383a9ba7c3e2e81f925d510 (patch)
treebbfc51b2bea582e4dbd37af4a3e257d0cec8ef25
parent7b8e68af09e20fd95656b8909f4fc027440c1c30 (diff)
downloadmkinitcpio-b9c0480fcd37bf021383a9ba7c3e2e81f925d510.tar.gz
mkinitcpio-b9c0480fcd37bf021383a9ba7c3e2e81f925d510.tar.xz
mkinitcpio: allow -S to be specified multiple times
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rwxr-xr-xmkinitcpio4
-rw-r--r--mkinitcpio.8.txt1
2 files changed, 4 insertions, 1 deletions
diff --git a/mkinitcpio b/mkinitcpio
index 9d59f0b..58979bf 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -120,7 +120,9 @@ while getopts ':c:k:sb:g:p:m:nvH:LMhS:t:z:' arg; do
p) PRESET=$OPTARG ;;
n) COLOR=0 ;;
v) QUIET=0 ;;
- S) IFS=, read -r -a SKIPHOOKS <<< "$OPTARG" ;;
+ S) IFS=, read -r -a skip <<< "$OPTARG"
+ SKIPHOOKS+=("${skip[@]}")
+ unset skip ;;
H) if script=$(find_in_dirs "$OPTARG" "${INSTDIR[@]}"); then
. "$script"
if [[ $(type -t help) != function ]]; then
diff --git a/mkinitcpio.8.txt b/mkinitcpio.8.txt
index 9a2d920..1eb42a8 100644
--- a/mkinitcpio.8.txt
+++ b/mkinitcpio.8.txt
@@ -64,6 +64,7 @@ Options
*-S* 'hooks'::
Skip 'hooks' when generating the image. Several hooks should be comma-separated.
+ This option can be specified multiple times.
*-s*::
Saves the build directory for the initial ramdisk. Default: no; This means