summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-12-07 17:56:33 +0000
committerColin Guthrie <colin@mageia.org>2013-12-07 18:32:06 +0000
commitcad4721a454d9fcda1a505fdd9825113ac034893 (patch)
tree997c316af60172b59676c9e0344cd1c467de785e
parent2137cf19edadc5e039ab9af523b1d5bc6e4ee136 (diff)
downloaddrakx-cad4721a454d9fcda1a505fdd9825113ac034893.tar
drakx-cad4721a454d9fcda1a505fdd9825113ac034893.tar.gz
drakx-cad4721a454d9fcda1a505fdd9825113ac034893.tar.bz2
drakx-cad4721a454d9fcda1a505fdd9825113ac034893.tar.xz
drakx-cad4721a454d9fcda1a505fdd9825113ac034893.zip
rescue: Mask an unimportant error when loading kernel modules.
Particularly the floppy module fails quite regularly. That said, do we even need floppy support these days?
-rwxr-xr-xrescue/make_rescue_img3
1 files changed, 3 insertions, 0 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 49dc1a8d1..8e3f64334 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -35,6 +35,9 @@ _ "../tools/install-xml-file-list list.xml $tmp";
_ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release";
_ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks";
+# Loading the floppy module causes this service to fail so lets mask this to
+# prevent a red "FAILED" briefly showing on the screen
+_ "sed -i s/ExecStart=/ExecStart=-/ $tmp/usr/lib/systemd/system/systemd-modules-load.service";
my %keytable_conflicts;
my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1);