Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (ba0befcef1651a90112c04f55c2a08d640857508)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (ba0befcef1651a90112c04f55c2a08d640857508)
  • Date: Wed, 5 Jul 2006 23:37:08 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

smgl/init.d/DETAILS | 2
smgl/init.d/HISTORY | 5 +
smgl/init.d/init.d/keymap.conf | 30 --------
smgl/init.d/init.d/keymap.sh | 116
---------------------------------
utils/console-tools/DETAILS | 1
utils/console-tools/HISTORY | 5 +
utils/console-tools/init.d/keymap.conf | 24 ++++++
utils/console-tools/init.d/keymap.sh | 103 +++++++++++++++++++++++++++++
utils/kbd/DETAILS | 2
utils/kbd/HISTORY | 5 +
utils/kbd/init.d/keymap.conf | 24 ++++++
utils/kbd/init.d/keymap.sh | 104 +++++++++++++++++++++++++++++
12 files changed, 273 insertions(+), 148 deletions(-)

New commits:
commit ba0befcef1651a90112c04f55c2a08d640857508
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Removed keymap.sh & keymap.conf from init.d spell and moved to kbd &
console-tools spells.

diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 973ef72..98397ce 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,7 +1,7 @@
SPELL=init.d
VERSION=2.2.0
LICENSE[0]=GPL
- PATCHLEVEL=9
+ PATCHLEVEL=10
BUILD_API=2
KEYWORDS="smgl"
ENTERED=20030505
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index f778ceb..2aab43b 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,8 @@
+2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
+ * init.d/keymap.sh, init.d/keymap.conf: Deleted, moved to kbd
+ and console-tools spells.
+ * DETAILS: PATCHLEVEL++
+
2006-06-17 Flavien Bridault <vlaaad AT sourcemage.org>
* init.d/devices: removed udevstart for kernels > 2.6.14, coldplug is
now working well
diff --git a/smgl/init.d/init.d/keymap.conf b/smgl/init.d/init.d/keymap.conf
deleted file mode 100644
index 16bea16..0000000
--- a/smgl/init.d/init.d/keymap.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sets the proper keymap for the particular keyboard connected to this
system.
-KEYMAP=defkeymap
-
-# This variable contains include keymaps to be loaded.
-INCLUDEMAPS=
-
-# Below are arguments passed to the consolechars and kbd programs. You
-# may wish to use this setting to change the console font and charmap
-# settings.
-# Only one of these variables is used depending on which program you
-# have installed. (consolechars is installed by the console-tools spell
-# and kbd by the kbd spell.)
-# For example to setup Frech font and charmap with consolechars use:
-# CONSOLECHARS_ARGS="-f lat1-16 -m iso15"
-# Synonymous arguments for setfont are:
-# SETFONT_ARGS="lat1-16 -m 8859-15"
-CONSOLECHARS_ARGS=
-SETFONT_ARGS=
-
-# This variable contains numbers of console nodes in /dev/ on which
-# fonts and charmap given in CONSOLECHARS_ARGS and SETFONT_ARGS will be
-# set. If value "*" is given, settings will be enabled on all available
-# console nodes.
-# (Notice: this variable needs to be defined for font and unicode
-# settings to take effect.)
-TTY_NUMS=
-
-# This variable tells the keymap.sh script to run unicode_start or not
-# It can be either on or cleared to unset it
-UNICODE_START=
diff --git a/smgl/init.d/init.d/keymap.sh b/smgl/init.d/init.d/keymap.sh
deleted file mode 100755
index e82e3ed..0000000
--- a/smgl/init.d/init.d/keymap.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-PROGRAM=/bin/loadkeys
-RUNLEVEL=S
-NEEDS="+local_fs"
-RECOMMENDED=yes
-
-. /etc/init.d/smgl_init
-. /etc/sysconfig/keymap
-. /etc/sysconfig/devices
-
-start()
-{
- if [ -n "$KEYMAP$INCLUDEMAPS" ]; then
- required_executable /bin/loadkeys
- fi
-
- if [ -n "$KEYMAP" ]; then
- /bin/loadkeys $KEYMAP
- evaluate_retval
- fi
-
- if [[ "$DEVICES" == "devfs" ]]
- then
- DEV_TTY="vc/"
- else
- DEV_TTY="tty"
- fi
-
- if [ -e "/usr/bin/consolechars" ]
- then
- required_executable /usr/bin/consolechars
- CONSOLE_TOOLS="console-tools"
- elif [ -e "/usr/bin/setfont" ]
- then
- required_executable /usr/bin/setfont
- CONSOLE_TOOLS="kbd"
- fi
- if [[ "$UNICODE_START" ]]
- then
- required_executable /usr/bin/unicode_start
- kbd_mode -u
- dumpkeys | loadkeys --unicode
- fi
-
- if [[ "$CONSOLE_TOOLS" == "console-tools" ]]
- then
- for a in $INCLUDEMAPS; do
- ! [[ "$a" =~ "\.gz$" ]] &&
- ! [[ "$a" =~ "\.inc$" ]] &&
- a="$a.inc"
- /bin/loadkeys $a
- evaluate_retval
- done
- if [[ "$TTY_NUMS" ]] && [[ "$CONSOLECHARS_ARGS" ]]
- then
- if [[ "$TTY_NUMS" =~ "\*" ]]; then
- unset TTY_NUMS
- for a in `grep ^tty.*: /etc/inittab`; do
- TTY_NUMS="$TTY_NUMS `expr "$a" : 'tty\([0-9]*\):.*'`"
- done
- fi
- for n in $TTY_NUMS
- do
- echo "Setting console settings for $DEV_TTY$n..."
- if [[ "$UNICODE_START" ]]
- then
- /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
- /usr/bin/consolechars $CONSOLECHARS_ARGS --tty=/dev/$DEV_TTY$n
- evaluate_retval
- else
- /usr/bin/consolechars $CONSOLECHARS_ARGS --tty=/dev/$DEV_TTY$n
- evaluate_retval
- fi
- done
- fi
- fi
-
- if [[ "$CONSOLE_TOOLS" == "kbd" ]]
- then
- for a in $INCLUDEMAPS; do
- /bin/loadkeys $a
- if [[ $? != 0 ]]; then
- ! [[ "$a" =~ "\.inc$" ]] && a="$a.inc" && /bin/loadkeys $a
- fi
- evaluate_retval
- done
- if [[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]]
- then
- if [[ "$TTY_NUMS" =~ "\*" ]]; then
- unset TTY_NUMS
- for a in `grep ^tty.*: /etc/inittab`; do
- TTY_NUMS="$TTY_NUMS `expr "$a" : 'tty\([0-9]*\):.*'`"
- done
- fi
- for n in $TTY_NUMS
- do
- echo "Setting console settings for $DEV_TTY$n..."
- if [[ "$UNICODE_START" ]]
- then
- /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
- /usr/bin/setfont $SETFONT_ARGS -C /dev/$DEV_TTY$n
- evaluate_retval
- else
- /usr/bin/setfont $SETFONT_ARGS -C /dev/$DEV_TTY$n
- evaluate_retval
- fi
- done
- fi
- fi
-}
-
-stop()
-{
- echo "Cannot stop keymap"
-}
diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index 6f1f568..4d75c2b 100755
--- a/utils/console-tools/DETAILS
+++ b/utils/console-tools/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://lct.sourceforge.net
ENTERED=20010922
UPDATED=20031124
+ PATCHLEVEL=1
KEYWORDS="utils"
SHORT="console-tools allows you to configure and manipulate Linux
consoles."
cat << EOF
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index 6d6b4e1..446667c 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,8 @@
+2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
+ * init.d/keymap.sh, init.d/keymap.conf: Added, moved from init.d
+ spell.
+ * DETAILS: Added PATCHLEVEL.
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/console-tools/init.d/keymap.conf
b/utils/console-tools/init.d/keymap.conf
new file mode 100644
index 0000000..4b9877d
--- /dev/null
+++ b/utils/console-tools/init.d/keymap.conf
@@ -0,0 +1,24 @@
+# Keymap to use for the system keyboard.
+KEYMAP=defkeymap
+
+# Includemaps to load.
+INCLUDEMAPS=
+
+# Arguments passed to the consolechars program. Use this to set the
+# console font and character map.
+# For example, to use Western European font and charmap:
+# CONSOLECHARS_ARGS="-f lat1-16 -m iso15"
+# Notice: TTY_NUMS must be defined for this to have effect.
+CONSOLECHARS_ARGS=
+
+# Consoles for which to apply font, charmap and unicode settings. If
+# value "*" is given, settings will be enabled for all available
+# console nodes.
+# Notice: This must be defined for CONSOLECHARS_ARGS and UNICODE_START
+# to have effect.
+TTY_NUMS=
+
+# Toggle unicode. Unicode is enabled if variable is set (any value will
+# do).
+# Notice: TTY_NUMS must be defined for this to have effect.
+UNICODE_START=
diff --git a/utils/console-tools/init.d/keymap.sh
b/utils/console-tools/init.d/keymap.sh
new file mode 100755
index 0000000..b45fe94
--- /dev/null
+++ b/utils/console-tools/init.d/keymap.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+PROGRAM=/bin/loadkeys
+RUNLEVEL=S
+NEEDS="+local_fs"
+RECOMMENDED=yes
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/keymap
+. /etc/sysconfig/devices
+
+dropfile=/var/tmp/keymap.drop
+
+start()
+{
+ [[ "$TTY_NUMS" ]] && [[ "$CONSOLECHARS_ARGS" ]] &&
+ required_executable /usr/bin/consolechars
+ [[ "$KEYMAP$INCLUDEMAPS" ]] &&
+ required_executable /bin/loadkeys
+
+ if [[ "$KEYMAP" ]]; then
+ echo "$(/bin/loadkeys $KEYMAP 2>&1)"
+ evaluate_retval
+ fi
+
+ for a in $INCLUDEMAPS; do
+ [[ $(find /usr/share/keymaps/ -type f -name "$a.inc*" 2>/dev/null) ]] &&
+ [[ ! $(find /usr/share/keymaps/ -type f -name "$a.kmap*" 2>/dev/null) ]]
&&
+ a="$a.inc"
+ 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
+ fi
+
+ if [[ "$TTY_NUMS" == '*' ]]; then
+ TTY_NUMS=
+ for a in $(grep ^tty.*: /etc/inittab); do
+ TTY_NUMS="$TTY_NUMS $(expr "$a" : 'tty\([0-9]*\):.*')"
+ done
+ fi
+
+ for n in $TTY_NUMS; do
+ echo "Loading settings for $DEV_TTY$n..."
+ if [[ "$CONSOLECHARS_ARGS" ]]; then
+ /usr/bin/consolechars $CONSOLECHARS_ARGS --tty=/dev/$DEV_TTY$n
+ evaluate_retval
+ fi
+ [[ "$UNICODE_START" ]] && /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
+ done
+
+ [[ -f $dropfile ]] && rm $dropfile
+ STATUS_VARS="KEYMAP INCLUDEMAPS CONSOLECHARS_ARGS TTY_NUMS UNICODE_START
DEV_TTY"
+ for a in $STATUS_VARS; do
+ /bin/echo "$a=\"${!a}\"" >> $dropfile
+ done
+}
+
+stop()
+{
+ [[ "$TTY_NUMS" ]] && [[ "$CONSOLECHARS_ARGS" ]] &&
+ required_executable /usr/bin/consolechars
+
+ [[ -f $dropfile ]] && . $dropfile && rm $dropfile
+
+ [[ "$KEYMAP$INCLUDEMAPS" ]] &&
+ required_executable /bin/loadkeys &&
+ echo "$(/bin/loadkeys defkeymap 2>&1)"
+
+ [[ "$UNICODE_START" ]] &&
+ required_executable /usr/bin/unicode_stop &&
+ /usr/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 [[ "$CONSOLECHARS_ARGS" ]]; then
+ /usr/bin/consolechars -d --tty=/dev/$DEV_TTY$n
+ evaluate_retval
+ fi
+ done
+}
+
+status()
+{
+ if [[ ! -f $dropfile ]]; then
+ echo "No status info available."
+ return 1
+ fi
+
+ . $dropfile
+
+ echo "KEYMAP=\"$KEYMAP\""
+ echo "INCLUDEMAPS=\"$INCLUDEMAPS\""
+ echo "CONSOLECHARS_ARGS=\"$CONSOLECHARS_ARGS\""
+ echo "TTY_NUMS=\"$TTY_NUMS\""
+ echo "UNICODE_START=\"$UNICODE_START\""
+}
diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index 30c46fd..52fb49a 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
WEB_SITE=http://freshmeat.net/projects/kbd/
ENTERED=20011113
UPDATED=20030823
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="Keytable files and keyboard utilities"
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 2e75d40..18549a6 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,8 @@
+2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
+ * init.d/keymap.sh, init.d/keymap.conf: Added, moved from init.d
+ spell.
+ * DETAILS: PATCHLEVEL++
+
2006-07-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: moved data dir to /usr/share (fixes bug #12628)

diff --git a/utils/kbd/init.d/keymap.conf b/utils/kbd/init.d/keymap.conf
new file mode 100644
index 0000000..2a2c5f4
--- /dev/null
+++ b/utils/kbd/init.d/keymap.conf
@@ -0,0 +1,24 @@
+# Keymap to use for the system keyboard.
+KEYMAP=defkeymap
+
+# Includemaps to load.
+INCLUDEMAPS=
+
+# Arguments passed to the setfont program. Use this to set the console
+# font and character map.
+# For example, to use unicode font with Western European charmap:
+# SETFONT_ARGS="lat9u-16 -m 8859-15"
+# Notice: TTY_NUMS must be defined for this to have effect.
+SETFONT_ARGS=
+
+# Consoles for which to apply font, charmap and unicode settings. If
+# value "*" is given, settings will be enabled for all available
+# console nodes.
+# Notice: This must be defined for SETFONT_ARGS and UNICODE_START to
+# have effect.
+TTY_NUMS=
+
+# Toggle unicode. Unicode is enabled if variable is set (any value will
+# do).
+# Notice: TTY_NUMS must be defined for this to have effect.
+UNICODE_START=
diff --git a/utils/kbd/init.d/keymap.sh b/utils/kbd/init.d/keymap.sh
new file mode 100755
index 0000000..922cce4
--- /dev/null
+++ b/utils/kbd/init.d/keymap.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+PROGRAM=/bin/loadkeys
+RUNLEVEL=S
+NEEDS="+local_fs"
+RECOMMENDED=yes
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/keymap
+. /etc/sysconfig/devices
+
+dropfile=/var/tmp/keymap.drop
+
+start()
+{
+ [[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]] &&
+ required_executable /usr/bin/setfont
+ [[ "$KEYMAP$INCLUDEMAPS" ]] &&
+ required_executable /bin/loadkeys
+
+ if [[ "$KEYMAP" ]]; then
+ echo "$(/bin/loadkeys $KEYMAP 2>&1)"
+ evaluate_retval
+ fi
+
+ for a in $INCLUDEMAPS; do
+ [[ $(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 "$(/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 | /bin/loadkeys --unicode
+ fi
+
+ if [[ "$TTY_NUMS" == '*' ]]; then
+ TTY_NUMS=
+ for a in $(grep ^tty.*: /etc/inittab); do
+ TTY_NUMS="$TTY_NUMS $(expr "$a" : 'tty\([0-9]*\):.*')"
+ done
+ fi
+
+ for n in $TTY_NUMS; do
+ 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
+ evaluate_retval
+ fi
+ done
+
+ [[ -f $dropfile ]] && rm $dropfile
+ STATUS_VARS="KEYMAP INCLUDEMAPS SETFONT_ARGS TTY_NUMS UNICODE_START
DEV_TTY"
+ for a in $STATUS_VARS; do
+ /bin/echo "$a=\"${!a}\"" >> $dropfile
+ done
+}
+
+stop()
+{
+ [[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]] &&
+ required_executable /usr/bin/setfont
+
+ [[ -f $dropfile ]] && . $dropfile && rm $dropfile
+
+ [[ "$KEYMAP$INCLUDEMAPS" ]] &&
+ required_executable /bin/loadkeys &&
+ echo "$(/bin/loadkeys defkeymap 2>&1)"
+
+ [[ "$UNICODE_START" ]] &&
+ required_executable /usr/bin/unicode_stop &&
+ /usr/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 -C /dev/$DEV_TTY$n
+ evaluate_retval
+ fi
+ done
+}
+
+status()
+{
+ if [[ ! -f $dropfile ]]; then
+ echo "No status info available."
+ return 1
+ fi
+
+ . $dropfile
+
+ echo "KEYMAP=\"$KEYMAP\""
+ echo "INCLUDEMAPS=\"$INCLUDEMAPS\""
+ echo "SETFONT_ARGS=\"$SETFONT_ARGS\""
+ echo "TTY_NUMS=\"$TTY_NUMS\""
+ echo "UNICODE_START=\"$UNICODE_START\""
+}



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (ba0befcef1651a90112c04f55c2a08d640857508), Juuso Alasuutari, 07/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page