diff options
author | David P <megver83@parabola.nu> | 2018-05-08 23:47:40 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2018-05-08 23:47:40 -0300 |
commit | 40a0ca9eb80616bf2bc7ad9db4e3cf4eb0d9e0e7 (patch) | |
tree | a2a919c5496103fa5dd75504ed80cd5dfac0b0bc /nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch | |
parent | 35299cf68a862c8d84fc50db078cbd3e187b530f (diff) | |
download | abslibre-40a0ca9eb80616bf2bc7ad9db4e3cf4eb0d9e0e7.tar.gz abslibre-40a0ca9eb80616bf2bc7ad9db4e3cf4eb0d9e0e7.tar.bz2 abslibre-40a0ca9eb80616bf2bc7ad9db4e3cf4eb0d9e0e7.zip |
nonsystemd/mkinitcpio: add package
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch')
-rw-r--r-- | nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch b/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch new file mode 100644 index 000000000..bd2668a36 --- /dev/null +++ b/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch @@ -0,0 +1,39 @@ +From 5bba09cb1c661627fde76b977cfe9f937b1264a3 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 6 Oct 2017 08:15:43 -0400 +Subject: [mkinitcpio] [PATCH] Restore addition of modules from config file + +Broken by c5ad00c2. + +ref: https://bugs.archlinux.org/task/55870 +--- + functions | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/functions b/functions +index 1486f2f..ba95e80 100644 +--- a/functions ++++ b/functions +@@ -627,9 +627,18 @@ parse_config() { + map add_file "${FILES[@]}" + + tee "$BUILDROOT/buildconfig" < "$1" | { ++ # When MODULES is not an array (but instead implicitly converted at ++ # startup), sourcing the config causes the string value of MODULES ++ # to be assigned as MODULES[0]. Avoid this by explicitly unsetting ++ # MODULES before re-sourcing the config. ++ unset MODULES ++ + . /dev/stdin + +- for mod in "${modules[@]%\?}"; do ++ # arrayize MODULES if necessary. ++ [[ ${MODULES@a} != *a* ]] && read -ra MODULES <<<"${MODULES//-/_}" ++ ++ for mod in "${MODULES[@]%\?}"; do + mod=${mod//-/_} + # only add real modules (2 == builtin) + (( _addedmodules["$mod"] == 1 )) && add+=("$mod") +-- +2.14.2 + |