* [gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd/files: ekey-ulusbd.conf ekey-ulusbd.init
@ 2009-09-29 12:03 99% Diego Petteno (flameeyes)
0 siblings, 0 replies; 1+ results
From: Diego Petteno (flameeyes) @ 2009-09-29 12:03 UTC (permalink / raw
To: gentoo-commits
flameeyes 09/09/29 12:03:21
Modified: ekey-ulusbd.conf ekey-ulusbd.init
Log:
New revision, thanks to the comments from Rob Kendrick (upstream); the init script now uses lsusb, and is only installed for non-Linux systems, while the correct udev rules are installed on Linux. Add a check for the CDC driver, and also add warnings about both the userland USB and CDC options.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Revision Changes Path
1.2 app-crypt/ekeyd/files/ekey-ulusbd.conf
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf?r1=1.1&r2=1.2
Index: ekey-ulusbd.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekey-ulusbd.conf 28 Sep 2009 18:29:36 -0000 1.1
+++ ekey-ulusbd.conf 29 Sep 2009 12:03:21 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf,v 1.1 2009/09/28 18:29:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf,v 1.2 2009/09/29 12:03:21 flameeyes Exp $
# The userland USB daemon has to know the USB path of the EntopyKey to
# work properly; in alternative to providing these statically, they
@@ -13,4 +13,4 @@
#USB_BUS=""
#USB_DEV=""
-SOCKET_PATH="/var/run/ekey.ulusbd.${EKEY_SERIAL}"
+SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
1.2 app-crypt/ekeyd/files/ekey-ulusbd.init
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init?r1=1.1&r2=1.2
Index: ekey-ulusbd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekey-ulusbd.init 28 Sep 2009 18:29:36 -0000 1.1
+++ ekey-ulusbd.init 29 Sep 2009 12:03:21 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init,v 1.1 2009/09/28 18:29:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init,v 1.2 2009/09/29 12:03:21 flameeyes Exp $
INSTANCE="${SVCNAME#*.}"
if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "ekey-ulusbd" ]; then
@@ -14,14 +14,13 @@
start() {
if [ -z ${USB_BUS} ]; then
- local devdir=$(fgrep -l 20df /sys/bus/usb/devices/*/idVendor \
- | xargs -n1 dirname \
- | xargs -I{} fgrep -l 0001 {}/idProduct \
- | xargs -n1 dirname \
- | xargs -I{} fgrep -l ${EKEY_SERIAL} {}/serial \
- | xargs -n1 dirname)
- USB_BUS=$(< ${devdir}/busnum)
- USB_DEV=$(< ${devdir}/devnum)
+ set -- $(lsusb -v -d 20df:0001 | \
+ egrep '(^Bus|iSerial)' | \
+ grep -B1 "${EKEY_SERIAL}" | \
+ head -n 1 | \
+ cut -c 5-7,15-18)
+ USB_BUS=$1
+ USB_DEV=$2
fi
ebegin "Starting EntropyKey Userland USB Daemon"
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2009-09-29 12:03 99% [gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd/files: ekey-ulusbd.conf ekey-ulusbd.init Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox