[vdr] Run vdr as non-root

Darren Salt linux at youmustbejoking.demon.co.uk
Thu Jan 12 19:28:27 CET 2006


I demand that Peter Juszack may or may not have written...

> By now I ran vdr as root. I wanted to change that but never did...

> When the setuid-stuff was introduced I now managed to do so. Since I
> beleive some people use Debian (like me)

I've been running it as non-root for ages.

> I will shortly describe what has to be done to eliminate access problems.
> I don not use LIRC so there will be no hints about that.

> 1. Create group vdr

> groupadd vdr

No need. It'll be created by adduser.

> 2. Create user vdr (no shell, home directroy will be video dir)

> useradd -s /bin/false -d /home/recordings -g vdr

Use adduser (see my vdr package - URL in .sig - for details).

> 3. Add user vdr to other groups if necessary (edit /etc/group)

  # adduser vdr <group>

> for DVD-access => disc

> 4. Chown your video-dir

> chown vdr.root /home/recording -R

  # chown vdr:vdr /home/recording -R

Using "." as a separator is deprecated.

> 5. Modify DVB-devices

> chown root.vdr /dev/dvb -R

  # adduser vdr video

> 6. Modify input-dev (for remote control)

> chown root.vdr /dev/input/event*

That will incorrectly change ownership of other input devices.

udev has a rule which will set group ownership of the appropriate device node
to "video".

> 7. Modify /proc/av7110_ir (Nexus remote-control)
> if you do not use a NEXUS-S with remote control you will probably have
> to modify something else

If you're using a card which requires the budget-ci driver, the driver sould
be frome patched kernel sources, patched v4l-dvb CVS, or
dvb-driver-source (which contains pre-patched sources).

dvb-utils is Very Useful either way.

Kernel patches:
  <URL:http://www.youmustbejoking.demon.co.uk/progs/linux/dvb-budget-ci.patch.tar.gz>
  Read the docs :-)

Kernel 2.6.15, current v4l-dvb CVS: patches attached. This is a different
approach to the same problem and will automatically select the appropriate
keymap for cards such as my Nova-T (subsystem ID 13C2:1011).

> chown root.vdr /proc/av7110_ir
> chmod 661 /proc/av7110_ir

Not needed. Load the keymap at boot (if the DVB driver is built in) or when
the module is loaded (via a file in /etc/modprobe.d).

[snip]
-- 
| Darren Salt | d youmustbejoking,demon,co,uk | nr. Ashington,
| Debian,     | s zap,tartarus,org            | Northumberland
| RISC OS     | @                             | Toon Army
|   <URL:http://www.youmustbejoking.demon.co.uk/progs.packages.html>

You have taken yourself too seriously.
-------------- next part --------------
budget-ci fixes and IR-related reorganisation

Fix a possible null-dereference in msp430_ir_deinit (which can occur if the
call to input_allocate_device() in msp430_ir_init failed).

Add a "physical ID" string for the input device.

Reorganise the budget_ci struct a little, putting the input-related bits in a
substructure.

Use a macro for the key repeat delay.

Be slightly more informative about IR input initialisation.

Signed-Off-By: Darren Salt <linux at youmustbejoking.demon.co.uk>

Index: linux/drivers/media/dvb/ttpci/budget-ci.c
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/dvb/ttpci/budget-ci.c,v
retrieving revision 1.46
diff -u -p -r1.46 budget-ci.c
--- linux/drivers/media/dvb/ttpci/budget-ci.c	4 Dec 2005 01:12:43 -0000	1.46
+++ linux/drivers/media/dvb/ttpci/budget-ci.c	20 Dec 2005 19:14:33 -0000
@@ -62,14 +62,21 @@
 #define SLOTSTATUS_READY	8
 #define SLOTSTATUS_OCCUPIED	(SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)
 
+#define IR_REPEAT_DELAY		350
+
+struct budget_ci_ir {
+	struct input_dev *dev;
+	char name[72]; /* 40 + 32 for (struct saa7146_dev).name */
+	char phys[32];
+};
+
 struct budget_ci {
 	struct budget budget;
-	struct input_dev *input_dev;
 	struct tasklet_struct msp430_irq_tasklet;
 	struct tasklet_struct ciintf_irq_tasklet;
 	int slot_status;
 	struct dvb_ca_en50221 ca;
-	char ir_dev_name[50];
+	struct budget_ci_ir ir;
 	u8 tuner_pll_address; /* used for philips_tdm1316l configs */
 };
 
@@ -145,7 +152,7 @@ static void msp430_ir_debounce(unsigned 
 static void msp430_ir_interrupt(unsigned long data)
 {
 	struct budget_ci *budget_ci = (struct budget_ci *) data;
-	struct input_dev *dev = budget_ci->input_dev;
+	struct input_dev *dev = budget_ci->ir.dev;
 	unsigned int code =
 		ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
 
@@ -170,8 +177,7 @@ static void msp430_ir_interrupt(unsigned
 		dev->repeat_key = code;
 		/* Zenith remote _always_ sends 2 sequences */
 		dev->rep[0] = ~0;
-		/* 350 milliseconds */
-		dev->timer.expires = jiffies + HZ * 350 / 1000;
+		dev->timer.expires = jiffies + HZ * IR_REPEAT_DELAY / 1000;
 		/* MAKE */
 		input_event(dev, EV_KEY, key_map[code], !0);
 		add_timer(&dev->timer);
@@ -184,41 +190,64 @@ static int msp430_ir_init(struct budget_
 	struct input_dev *input_dev;
 	int i;
 
-	budget_ci->input_dev = input_dev = input_allocate_device();
+	budget_ci->ir.dev = input_dev = input_allocate_device();
 	if (!input_dev)
+	{
+		printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
 		return -ENOMEM;
+	}
 
-	sprintf(budget_ci->ir_dev_name, "Budget-CI dvb ir receiver %s", saa->name);
+	snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name), "Budget-CI dvb ir receiver %s", saa->name);
+	snprintf(budget_ci->ir.phys, sizeof(budget_ci->ir.phys), "pci-%s/ir0", pci_name(saa->pci));
 
-	input_dev->name = budget_ci->ir_dev_name;
+	input_dev->name = budget_ci->ir.name;
 
 	set_bit(EV_KEY, input_dev->evbit);
 	for (i = 0; i < ARRAY_SIZE(key_map); i++)
 		if (key_map[i])
 			set_bit(key_map[i], input_dev->keybit);
 
-	input_register_device(budget_ci->input_dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+	input_dev->phys = budget_ci->ir.phys;
+	input_dev->id.bustype = BUS_PCI;
+	input_dev->id.version = 1;
+	if (saa->pci->subsystem_vendor) {
+		input_dev->id.vendor = saa->pci->subsystem_vendor;
+		input_dev->id.product = saa->pci->subsystem_device;
+	} else {
+		input_dev->id.vendor = saa->pci->vendor;
+		input_dev->id.product = saa->pci->device;
+	}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+	input_dev->cdev.dev = &saa->pci->dev;
+#else
+	input_dev->dev = &saa->pci->dev;
+#endif
+#endif
+	input_register_device(input_dev);
 
 	input_dev->timer.function = msp430_ir_debounce;
 
 	saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06);
 	saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
 
+	printk("budget_ci: IR interface initialised\n");
 	return 0;
 }
 
 static void msp430_ir_deinit(struct budget_ci *budget_ci)
 {
 	struct saa7146_dev *saa = budget_ci->budget.dev;
-	struct input_dev *dev = budget_ci->input_dev;
+	struct input_dev *dev = budget_ci->ir.dev;
 
 	saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_06);
 	saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
 
-	if (del_timer(&dev->timer))
-		input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
-
-	input_unregister_device(dev);
+	if (dev) {
+		if (del_timer(&dev->timer))
+			input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
+		input_unregister_device(dev);
+	}
 }
 
 static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
@@ -1093,7 +1122,7 @@ static int budget_ci_attach(struct saa71
 	struct budget_ci *budget_ci;
 	int err;
 
-	if (!(budget_ci = kmalloc(sizeof(struct budget_ci), GFP_KERNEL)))
+	if (!(budget_ci = kzalloc(sizeof(struct budget_ci), GFP_KERNEL)))
 		return -ENOMEM;
 
 	dprintk(2, "budget_ci: %p\n", budget_ci);
-------------- next part --------------
budget-ci fixes and IR-related reorganisation

Make budget-ci use ir-common (for key remapping).

Select "Hauppauge grey" keymap for Nova-T (subsystem 13C2:1011); my remote
control has a subset of the keys defined in that mapping.

Signed-Off-By: Darren Salt <linux at youmustbejoking.demon.co.uk>

diff -u linux/drivers/media/dvb/ttpci/budget-ci.c linux/drivers/media/dvb/ttpci/budget-ci.c
--- linux/drivers/media/dvb/ttpci/budget-ci.c	20 Dec 2005 19:14:33 -0000
+++ linux/drivers/media/dvb/ttpci/budget-ci.c	4 Jan 2006 22:38:50 -0000
@@ -4,6 +4,7 @@
  * Compiled from various sources by Michael Hunold <michael at mihu.de>
  *
  *     msp430 IR support contributed by Jack Thomasson <jkt at Helius.COM>
+ *       modified to use ir-common by Darren Salt <linux at youmustbejoking.demon.co.uk>
  *     partially based on the Siemens DVB driver by Ralph+Marcus Metzler
  *
  * CI interface support (c) 2004 Andrew de Quincey <adq_dvb at lidskialf.net>
@@ -37,6 +38,8 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/spinlock.h>
+#include <linux/version.h>
+#include <media/ir-common.h>
 
 #include "dvb_ca_en50221.h"
 #include "stv0299.h"
@@ -66,6 +69,7 @@
 
 struct budget_ci_ir {
 	struct input_dev *dev;
+	struct ir_input_state state;
 	char name[72]; /* 40 + 32 for (struct saa7146_dev).name */
 	char phys[32];
 };
@@ -85,7 +89,7 @@
    Hauppauge (from NOVA-CI-s box product)
    i've taken a "middle of the road" approach and note the differences
 */
-static u16 key_map[64] = {
+static IR_KEYTAB_TYPE key_map[IR_KEYTAB_SIZE] = {
 	/* 0x0X */
 	KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8,
 	KEY_9,
@@ -136,17 +140,18 @@
 
 static void msp430_ir_debounce(unsigned long data)
 {
-	struct input_dev *dev = (struct input_dev *) data;
+	struct budget_ci_ir *ir = (struct budget_ci_ir *) data;
 
-	if (dev->rep[0] == 0 || dev->rep[0] == ~0) {
-		input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
+	if (ir->dev->rep[0] == 0 || ir->dev->rep[0] == ~0)
 		return;
-	}
 
-	dev->rep[0] = 0;
-	dev->timer.expires = jiffies + HZ * 350 / 1000;
-	add_timer(&dev->timer);
-	input_event(dev, EV_KEY, key_map[dev->repeat_key], 2);	/* REPEAT */
+	/* we only ever get key-down, so we have to handle repeat ourselves */
+	ir_input_keydown(ir->dev, &ir->state, ir->state.ir_key, ir->state.ir_raw);
+	ir_input_nokey(ir->dev, &ir->state);
+
+	ir->dev->rep[0] = 0;
+	ir->dev->timer.expires = jiffies + HZ * IR_REPEAT_DELAY / 1000;
+	add_timer(&ir->dev->timer);
 }
 
 static void msp430_ir_interrupt(unsigned long data)
@@ -160,26 +165,20 @@
 		code &= 0x3f;
 
 		if (timer_pending(&dev->timer)) {
-			if (code == dev->repeat_key) {
+			if (code == budget_ci->ir.state.ir_raw) {
 				++dev->rep[0];
 				return;
 			}
 			del_timer(&dev->timer);
-			input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
 		}
 
-		if (!key_map[code]) {
-			printk("DVB (%s): no key for %02x!\n", __FUNCTION__, code);
-			return;
-		}
+		ir_input_keydown(dev, &budget_ci->ir.state, code, code);
+		ir_input_nokey(dev, &budget_ci->ir.state);
 
-		/* initialize debounce and repeat */
-		dev->repeat_key = code;
 		/* Zenith remote _always_ sends 2 sequences */
 		dev->rep[0] = ~0;
 		dev->timer.expires = jiffies + HZ * IR_REPEAT_DELAY / 1000;
 		/* MAKE */
-		input_event(dev, EV_KEY, key_map[code], !0);
 		add_timer(&dev->timer);
 	}
 }
@@ -188,7 +187,7 @@
 {
 	struct saa7146_dev *saa = budget_ci->budget.dev;
 	struct input_dev *input_dev;
-	int i;
+	IR_KEYTAB_TYPE *keys;
 
 	budget_ci->ir.dev = input_dev = input_allocate_device();
 	if (!input_dev)
@@ -200,13 +199,19 @@
 	snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name), "Budget-CI dvb ir receiver %s", saa->name);
 	snprintf(budget_ci->ir.phys, sizeof(budget_ci->ir.phys), "pci-%s/ir0", pci_name(saa->pci));
 
-	input_dev->name = budget_ci->ir.name;
+	/* Select keymap */
+	switch (budget_ci->budget.dev->pci->subsystem_device) {
+	case 0x1011:		// Hauppauge/TT Nova-T budget (tda10045/Philips tdm1316l(tda6651tt) + TDA9889)
+		keys = ir_codes_hauppauge_new; /* more keys defined than are physically present */
+		break;
 
-	set_bit(EV_KEY, input_dev->evbit);
-	for (i = 0; i < ARRAY_SIZE(key_map); i++)
-		if (key_map[i])
-			set_bit(key_map[i], input_dev->keybit);
+	default:		// unknown or insufficient information - FIXME
+		keys = key_map;
+		break;
+	}
+	ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5, keys);
 
+	input_dev->name = budget_ci->ir.name;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 	input_dev->phys = budget_ci->ir.phys;
 	input_dev->id.bustype = BUS_PCI;
@@ -224,9 +229,13 @@
 	input_dev->dev = &saa->pci->dev;
 #endif
 #endif
-	input_register_device(input_dev);
 
+	input_dev->rep[0] = 0;
+	input_dev->rep[1] = IR_REPEAT_DELAY;
 	input_dev->timer.function = msp430_ir_debounce;
+	input_dev->timer.data = (unsigned long) &budget_ci->ir;
+
+	input_register_device(input_dev);
 
 	saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06);
 	saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
@@ -245,7 +254,7 @@
 
 	if (dev) {
 		if (del_timer(&dev->timer))
-			input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
+			ir_input_nokey(budget_ci->ir.dev, &budget_ci->ir.state);
 		input_unregister_device(dev);
 	}
 }
only in patch2:
unchanged:
--- linux/drivers/media/dvb/ttpci/Kconfig	27 Dec 2005 13:07:35 -0000	1.22
+++ linux/drivers/media/dvb/ttpci/Kconfig	4 Jan 2006 22:38:47 -0000
@@ -82,6 +82,7 @@
 	tristate "Budget cards with onboard CI connector"
 	depends on DVB_CORE && PCI
 	select VIDEO_SAA7146
+	select VIDEO_IR
 	select DVB_STV0297
 	select DVB_STV0299
 	select DVB_TDA1004X


More information about the vdr mailing list