diff options
author | David P <megver83@parabola.nu> | 2019-02-02 00:10:51 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2019-02-02 00:10:51 -0300 |
commit | 2c38f92da499fb18e22123f76b3158c46e3247cc (patch) | |
tree | 7bf012cd428ef66e5911e6ff4d97f4b1eeb23b78 /nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch | |
parent | b77e47af2a7f49e7869d433ad6bbf542ed69e9c4 (diff) | |
download | abslibre-2c38f92da499fb18e22123f76b3158c46e3247cc.tar.gz abslibre-2c38f92da499fb18e22123f76b3158c46e3247cc.tar.bz2 abslibre-2c38f92da499fb18e22123f76b3158c46e3247cc.zip |
upgpkg: nonsystemd/mkinitcpio 25-1.nonsystemd1
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, 0 insertions, 39 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 deleted file mode 100644 index bd2668a36..000000000 --- a/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - |