* [gentoo-commits] baselayout r3117 - branches/baselayout-1_12/init.d
@ 2008-03-31 0:01 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2008-03-31 0:01 UTC (permalink / raw
To: gentoo-commits
Author: vapier
Date: 2008-03-31 00:01:13 +0000 (Mon, 31 Mar 2008)
New Revision: 3117
Modified:
branches/baselayout-1_12/init.d/consolefont
branches/baselayout-1_12/init.d/keymaps
Log:
use kbd binaries in PATH #215496
Modified: branches/baselayout-1_12/init.d/consolefont
===================================================================
--- branches/baselayout-1_12/init.d/consolefont 2008-03-24 07:26:25 UTC (rev 3116)
+++ branches/baselayout-1_12/init.d/consolefont 2008-03-31 00:01:13 UTC (rev 3117)
@@ -32,7 +32,7 @@
# Set the console font
local errmsg=""
ebegin "Setting user font"
- if [[ -x /bin/setfont ]] ; then
+ if type -P setfont ; then
# We patched setfont to have --tty support ...
if [[ -n $(setfont --help 2>&1 | grep -e '--tty') || \
-n $(setfont --help 2>&1 | grep -e '-C') ]]
@@ -48,18 +48,18 @@
|| ttydev=/dev/tty
for x in $(seq 1 "${RC_TTY_NUMBER}") ; do
- /bin/setfont ${CONSOLEFONT} ${param} \
+ setfont ${CONSOLEFONT} ${param} \
${sf_param}/${ttydev}${x} > /dev/null
retval=$?
done
else
- /bin/setfont ${CONSOLEFONT} ${param} > /dev/null
+ setfont ${CONSOLEFONT} ${param} > /dev/null
retval=$?
fi
errmsg="Failed to set user font"
else
retval=1
- errmsg="/bin/setfont not found"
+ errmsg="setfont not found"
fi
eend ${retval} "${errmsg}"
}
Modified: branches/baselayout-1_12/init.d/keymaps
===================================================================
--- branches/baselayout-1_12/init.d/keymaps 2008-03-24 07:26:25 UTC (rev 3116)
+++ branches/baselayout-1_12/init.d/keymaps 2008-03-31 00:01:13 UTC (rev 3117)
@@ -36,17 +36,17 @@
# Turn on unicode if user wants it
if [[ ${UNICODE} == "yes" ]] ; then
- /usr/bin/kbd_mode -u
+ kbd_mode -u
fi
ebegin "Loading key mappings"
- if [[ -x /bin/loadkeys ]] ; then
+ if type -P loadkeys ; then
[[ ${SET_WINDOWKEYS} == "yes" ]] && WINDOWKEYS_KEYMAP="windowkeys"
- /bin/loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
- ${EXTENDED_KEYMAPS} > /dev/null
+ loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
+ ${EXTENDED_KEYMAPS} > /dev/null
eend $? "Error loading key mappings"
else
- eend 1 "/bin/loadkeys not found"
+ eend 1 "loadkeys not found"
return 1
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-31 0:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-31 0:01 [gentoo-commits] baselayout r3117 - branches/baselayout-1_12/init.d Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox