Browse Source

Rename tag 'hotplug' into 'agent'

Makefile: Make backups of /etc/pamusb.conf before overwriting
Andrea Luzzardi 18 years ago
parent
commit
e4bee02bd5
3 changed files with 7 additions and 8 deletions
  1. +1
    -1
      Makefile
  2. +5
    -6
      doc/pamusb.conf
  3. +1
    -1
      tools/pamusb-agent

+ 1
- 1
Makefile View File

@ -76,7 +76,7 @@ install : all
$(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST) $(MANS_DEST) $(TOOLS_DEST) $(PAM_USB_DEST) $(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST) $(MANS_DEST) $(TOOLS_DEST) $(PAM_USB_DEST)
$(INSTALL) -m755 $(PAM_USB) $(PAM_USB_DEST) $(INSTALL) -m755 $(PAM_USB) $(PAM_USB_DEST)
$(INSTALL) -m755 $(PAMUSB_CHECK) $(TOOLS_SRC)/$(PAMUSB_CONF) $(TOOLS_SRC)/$(PAMUSB_AGENT) $(TOOLS_DEST) $(INSTALL) -m755 $(PAMUSB_CHECK) $(TOOLS_SRC)/$(PAMUSB_CONF) $(TOOLS_SRC)/$(PAMUSB_AGENT) $(TOOLS_DEST)
$(INSTALL) -m644 $(CONFS) $(CONFS_DEST)
$(INSTALL) -b -m644 $(CONFS) $(CONFS_DEST)
$(INSTALL) -m644 $(DOCS) $(DOCS_DEST) $(INSTALL) -m644 $(DOCS) $(DOCS_DEST)
$(INSTALL) -m644 $(MANS) $(MANS_DEST) $(INSTALL) -m644 $(MANS) $(MANS_DEST)


+ 5
- 6
doc/pamusb.conf View File

@ -1,6 +1,5 @@
<!-- <!--
pusb.conf-dist: Default configuration file for pam_usb.
Copy this file to /etc/pusb/pusb.conf if you don't already have one.
pamusb.conf: Configuration file for pam_usb.
See http://www.pamusb.org/doc/configuring See http://www.pamusb.org/doc/configuring
--> -->
@ -16,7 +15,7 @@ See http://www.pamusb.org/doc/configuring
<!-- Device settings --> <!-- Device settings -->
<devices> <devices>
<!-- Example: <!-- Example:
Note: You should use pusb_conf to add devices automatically.
Note: You should use pamusb-conf to add devices automatically.
<device id="MyDevice"> <device id="MyDevice">
<vendor>SanDisk Corp.</vendor> <vendor>SanDisk Corp.</vendor>
<model>Cruzer Titanium</model> <model>Cruzer Titanium</model>
@ -31,11 +30,11 @@ See http://www.pamusb.org/doc/configuring
<!-- User settings --> <!-- User settings -->
<users> <users>
<!-- Example: <!-- Example:
<user id="root">
<user id="scox">
<device>MyDevice</device> <device>MyDevice</device>
<option name="quiet">true</option> <option name="quiet">true</option>
<hotplug event="lock">gnome-screensaver-command -lock</hotplug>
<hotplug event="unlock">gnome-screensaver-command -deactivate</hotplug>
<agent event="lock">gnome-screensaver-command -lock</agent>
<agent event="unlock">gnome-screensaver-command -deactivate</agent>
</user> </user>
--> -->
</users> </users>


+ 1
- 1
tools/pamusb-agent View File

@ -155,7 +155,7 @@ events = {
'unlock' : [] 'unlock' : []
} }
for hotplug in user.findall('hotplug'):
for hotplug in user.findall('agent'):
events[hotplug.get('event')].append(hotplug.text) events[hotplug.get('event')].append(hotplug.text)
deviceName = user.find('device').text deviceName = user.find('device').text


Loading…
Cancel
Save