| 1 |
Author: vapier |
| 2 |
Date: 2008-03-31 00:01:13 +0000 (Mon, 31 Mar 2008) |
| 3 |
New Revision: 3117 |
| 4 |
|
| 5 |
Modified: |
| 6 |
branches/baselayout-1_12/init.d/consolefont |
| 7 |
branches/baselayout-1_12/init.d/keymaps |
| 8 |
Log: |
| 9 |
use kbd binaries in PATH #215496 |
| 10 |
|
| 11 |
Modified: branches/baselayout-1_12/init.d/consolefont |
| 12 |
=================================================================== |
| 13 |
--- branches/baselayout-1_12/init.d/consolefont 2008-03-24 07:26:25 UTC (rev 3116) |
| 14 |
+++ branches/baselayout-1_12/init.d/consolefont 2008-03-31 00:01:13 UTC (rev 3117) |
| 15 |
@@ -32,7 +32,7 @@ |
| 16 |
# Set the console font |
| 17 |
local errmsg="" |
| 18 |
ebegin "Setting user font" |
| 19 |
- if [[ -x /bin/setfont ]] ; then |
| 20 |
+ if type -P setfont ; then |
| 21 |
# We patched setfont to have --tty support ... |
| 22 |
if [[ -n $(setfont --help 2>&1 | grep -e '--tty') || \ |
| 23 |
-n $(setfont --help 2>&1 | grep -e '-C') ]] |
| 24 |
@@ -48,18 +48,18 @@ |
| 25 |
|| ttydev=/dev/tty |
| 26 |
|
| 27 |
for x in $(seq 1 "${RC_TTY_NUMBER}") ; do |
| 28 |
- /bin/setfont ${CONSOLEFONT} ${param} \ |
| 29 |
+ setfont ${CONSOLEFONT} ${param} \ |
| 30 |
${sf_param}/${ttydev}${x} > /dev/null |
| 31 |
retval=$? |
| 32 |
done |
| 33 |
else |
| 34 |
- /bin/setfont ${CONSOLEFONT} ${param} > /dev/null |
| 35 |
+ setfont ${CONSOLEFONT} ${param} > /dev/null |
| 36 |
retval=$? |
| 37 |
fi |
| 38 |
errmsg="Failed to set user font" |
| 39 |
else |
| 40 |
retval=1 |
| 41 |
- errmsg="/bin/setfont not found" |
| 42 |
+ errmsg="setfont not found" |
| 43 |
fi |
| 44 |
eend ${retval} "${errmsg}" |
| 45 |
} |
| 46 |
|
| 47 |
Modified: branches/baselayout-1_12/init.d/keymaps |
| 48 |
=================================================================== |
| 49 |
--- branches/baselayout-1_12/init.d/keymaps 2008-03-24 07:26:25 UTC (rev 3116) |
| 50 |
+++ branches/baselayout-1_12/init.d/keymaps 2008-03-31 00:01:13 UTC (rev 3117) |
| 51 |
@@ -36,17 +36,17 @@ |
| 52 |
|
| 53 |
# Turn on unicode if user wants it |
| 54 |
if [[ ${UNICODE} == "yes" ]] ; then |
| 55 |
- /usr/bin/kbd_mode -u |
| 56 |
+ kbd_mode -u |
| 57 |
fi |
| 58 |
|
| 59 |
ebegin "Loading key mappings" |
| 60 |
- if [[ -x /bin/loadkeys ]] ; then |
| 61 |
+ if type -P loadkeys ; then |
| 62 |
[[ ${SET_WINDOWKEYS} == "yes" ]] && WINDOWKEYS_KEYMAP="windowkeys" |
| 63 |
- /bin/loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \ |
| 64 |
- ${EXTENDED_KEYMAPS} > /dev/null |
| 65 |
+ loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \ |
| 66 |
+ ${EXTENDED_KEYMAPS} > /dev/null |
| 67 |
eend $? "Error loading key mappings" |
| 68 |
else |
| 69 |
- eend 1 "/bin/loadkeys not found" |
| 70 |
+ eend 1 "loadkeys not found" |
| 71 |
return 1 |
| 72 |
fi |
| 73 |
|
| 74 |
|
| 75 |
-- |
| 76 |
gentoo-commits@l.g.o mailing list |
Archives