Changeset 3785 in MondoRescue for branches

Timestamp:

Apr 2, 2021, 6:56:38 PM (4 years ago)

Author:

Bruno Cornec

Message:

Fix #874 - improved byeboard support for opensuse 15.2 from Frank Schütte F.Schuette_at_t-online.de

Location:

branches/3.3/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/usr/sbin/install-additional-tools (modified) (1 diff)

branches/3.3/mindi/mindi

@@ -403 +403 @@
     local r res mapfile mappath included_item included_list keyfile mp locale
     LogAll "INFO: Analyzing your keyboard's configuration."
-    KEYDIR=/usr/lib/kbd
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
+    KEYDIR=/usr/share/kbd       # Slackware
+    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console-setup
@@ -414 +414 @@
         LogFile "INFO: KEYDIR=$KEYDIR"
     fi
-    if [ -e "/etc/sysconfig/keyboard" ] ; then
+    if [ -e "/etc/vconsole.conf" ] ; then
+        LogFile "INFO: New Fedora style config detected."
+        keyfile=/etc/vconsole.conf
+    elif [ -e "/etc/sysconfig/keyboard" ] ; then
         LogFile "INFO: Red Hat-style config detected."
         keyfile=/etc/sysconfig/keyboard
-    elif [ -e "/etc/vconsole.conf" ] ; then
-        LogFile "INFO: New Fedora style config detected."
-        keyfile=/etc/vconsole.conf
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
         LogFile "INFO: Slackware-style config detected."

branches/3.3/mindi/rootfs/usr/sbin/install-additional-tools

@@ -55 +55 @@
 if [ -f etc/fstab ]; then
     cp etc/fstab /tmp
+else
+    LogIt "No fstab found under $mountdir"
 fi
 if [ -f etc/raidtab ]; then