Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b3c9bb6abb7212341e129dc12ec723de298ce941)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b3c9bb6abb7212341e129dc12ec723de298ce941)
  • Date: Wed, 11 Feb 2009 01:06:07 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

utils/kbd/BUILD | 2 +-
utils/kbd/HISTORY | 3 +++
utils/kbd/init.d/keymap.sh | 30 +++++++++++++++---------------
3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit b3c9bb6abb7212341e129dc12ec723de298ce941
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

kbd programs are needed at boot-time, so install them in /bin

diff --git a/utils/kbd/BUILD b/utils/kbd/BUILD
index de7418a..0ae5d40 100755
--- a/utils/kbd/BUILD
+++ b/utils/kbd/BUILD
@@ -1,3 +1,3 @@
-OPTS="$KBD_OPT $OPTS" &&
+OPTS="--bindir=${TRACK_ROOT}/bin $KBD_OPT $OPTS" &&

default_build
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 8edd101..191ec64 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,6 @@
+2009-02-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: kbd programs are needed at boot-time, so install them in /bin
+
2009-02-06 Eric Sandall <sandalle AT sourcemage.org>
* fgconsole-serial.patch: Include linux/types.h before linux/serial.h
Based on Julien's hal/probe-serial.patch
diff --git a/utils/kbd/init.d/keymap.sh b/utils/kbd/init.d/keymap.sh
index 79342c6..6b5808f 100755
--- a/utils/kbd/init.d/keymap.sh
+++ b/utils/kbd/init.d/keymap.sh
@@ -1,6 +1,6 @@
#!/bin/bash

-PROGRAM=/usr/bin/loadkeys
+PROGRAM=/bin/loadkeys
RUNLEVEL=S
NEEDS="+local_fs"
RECOMMENDED=yes
@@ -14,12 +14,12 @@ dropfile=/var/tmp/keymap.drop
start()
{
[[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]] &&
- required_executable /usr/bin/setfont
+ required_executable /bin/setfont
[[ "$KEYMAP$INCLUDEMAPS" ]] &&
- required_executable /usr/bin/loadkeys
+ required_executable /bin/loadkeys

if [[ "$KEYMAP" ]]; then
- echo "$(/usr/bin/loadkeys $KEYMAP 2>&1)"
+ echo "$(/bin/loadkeys $KEYMAP 2>&1)"
evaluate_retval
fi

@@ -27,16 +27,16 @@ start()
[[ $(find /usr/share/kbd/keymaps/ -type f -name "$a.inc*" 2>/dev/null)
]] &&
[[ ! $(find /usr/share/kbd/keymaps/ -type f -name "$a.map*" 2>/dev/null)
]] &&
a="$a.inc"
- echo "$(/usr/bin/loadkeys $a 2>&1)"
+ echo "$(/bin/loadkeys $a 2>&1)"
evaluate_retval
done

[[ "$DEVICES" == "devfs" ]] && DEV_TTY="vc/" || DEV_TTY="tty"

if [[ "$UNICODE_START" ]]; then
- required_executable /usr/bin/unicode_start
- /usr/bin/kbd_mode -u
- /usr/bin/dumpkeys | /usr/bin/loadkeys --unicode
+ required_executable /bin/unicode_start
+ /bin/kbd_mode -u
+ /bin/dumpkeys | /bin/loadkeys --unicode
fi

if [[ "$TTY_NUMS" == '*' ]]; then
@@ -50,7 +50,7 @@ start()
echo "Loading settings for $DEV_TTY$n..."
[[ "$UNICODE_START" ]] && /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
if [[ "$SETFONT_ARGS" ]]; then
- /usr/bin/setfont $SETFONT_ARGS -C /dev/$DEV_TTY$n
+ /bin/setfont $SETFONT_ARGS -C /dev/$DEV_TTY$n
evaluate_retval
fi
done
@@ -65,23 +65,23 @@ start()
stop()
{
[[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]] &&
- required_executable /usr/bin/setfont
+ required_executable /bin/setfont

[[ -f $dropfile ]] && . $dropfile && rm $dropfile

[[ "$KEYMAP$INCLUDEMAPS" ]] &&
- required_executable /usr/bin/loadkeys &&
- echo "$(/usr/bin/loadkeys defkeymap 2>&1)"
+ required_executable /bin/loadkeys &&
+ echo "$(/bin/loadkeys defkeymap 2>&1)"

[[ "$UNICODE_START" ]] &&
- required_executable /usr/bin/unicode_stop &&
- /usr/bin/kbd_mode -a
+ required_executable /bin/unicode_stop &&
+ /bin/kbd_mode -a

for n in $TTY_NUMS; do
echo "Unloading settings for $DEV_TTY$n..."
[[ "$UNICODE_START" ]] && /bin/echo -ne '\033%@' > /dev/$DEV_TTY$n
if [[ "$SETFONT_ARGS" ]]; then
- /usr/bin/setfont default8x16 -C /dev/$DEV_TTY$n
+ /bin/setfont default8x16 -C /dev/$DEV_TTY$n
evaluate_retval
fi
done



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b3c9bb6abb7212341e129dc12ec723de298ce941), Ismael Luceno, 02/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page