diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-06-16 12:27:52 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-06-16 12:35:50 +0200 |
| commit | b015e460989ca0c0b9a51e7f8259bbf1e69d4a31 (patch) | |
| tree | f96f44a674f7518e5dc8e03731267cea56d54ce9 | |
| parent | 65589f334589df0cf161300dae18a822e425cf3a (diff) | |
| download | drakx-b015e460989ca0c0b9a51e7f8259bbf1e69d4a31.tar drakx-b015e460989ca0c0b9a51e7f8259bbf1e69d4a31.tar.gz drakx-b015e460989ca0c0b9a51e7f8259bbf1e69d4a31.tar.bz2 drakx-b015e460989ca0c0b9a51e7f8259bbf1e69d4a31.tar.xz drakx-b015e460989ca0c0b9a51e7f8259bbf1e69d4a31.zip | |
do not run loadkeys w/o arg
we would if DEBUG_INSTALL_LANG is not set (mga#26782)
Bug introduced in commit 5afc3e4932fdbcfa35c7fe6ae0b22cccd71958ce
| -rw-r--r-- | rescue/Makefile | 2 | ||||
| -rw-r--r-- | rescue/NEWS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rescue/Makefile b/rescue/Makefile index 1f50534aa..eefbc9a79 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -11,7 +11,7 @@ install: $(RESCUE) cp -f $< $(STAGE2_DEST) $(RESCUE): $(wildcard tree/**/*) $(wildcard bin/*) $(wildcard sbin/*) make_rescue_img list.xml aliases - [ -n $$DEBUG_INSTALL_LANG ] && perl -pi -e '$$_ = "loadkeys '$$DEBUG_INSTALL_LANG'\n$$_" if /LANGUAGE/' tree/usr/bin/mageia-rescue + if [[ -n "$$DEBUG_INSTALL_LANG" ]]; then perl -pi -e '$$_ = "loadkeys '$$DEBUG_INSTALL_LANG'\n$$_" if /LANGUAGE/' tree/usr/bin/mageia-rescue; fi DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img dist: tar diff --git a/rescue/NEWS b/rescue/NEWS index a89ebe368..e4370e3e6 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,5 @@ +- fix running loadkeys w/o arg if DEBUG_INSTALL_LANG is not set (mga#26782) + Version 1.64 - 20 March 2020 by Thierry Vignaud - debug mode: |