From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Thu, 29 Sep 2005 10:44:58 +0000 (+0000)
Subject: update requested by Oliver Ertl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=945d8f383c7a846a0c237553cb09163da9a03f9f;p=openwrt%2Fstaging%2Frmilecki.git

update requested by Oliver Ertl

SVN-Revision: 2000
---

diff --git a/openwrt/package/p910nd/files/p910nd.default b/openwrt/package/p910nd/files/p910nd.default
index 156609a3e5b..1ee3bcbaf11 100644
--- a/openwrt/package/p910nd/files/p910nd.default
+++ b/openwrt/package/p910nd/files/p910nd.default
@@ -1,8 +1,12 @@
-# Port 9100 is copied to /dev/lp0, 9101 to /dev/lp1 and 9102
-# to /dev/lp2. The default is port 9100 to /dev/lp0.
+# Port 9100 is copied to /dev/printers/0, 9101 to /dev/printers/1
+# and 9102 to /dev/printers/2. The default is port 9100 to
+# /dev/printers/0.
 # Values are 0|1|2
 #
-#PORT="0"
+# Port 9100 for USB connection
+# Port 9101 for LPT connection
+#
+PORT="0"
 
 # The -b option turns on bidirectional copying.
 # The -f option can be used to specify a different printer device.
diff --git a/openwrt/package/p910nd/files/p910nd.init b/openwrt/package/p910nd/files/p910nd.init
index 44bff5b5054..688090d9194 100644
--- a/openwrt/package/p910nd/files/p910nd.init
+++ b/openwrt/package/p910nd/files/p910nd.init
@@ -8,7 +8,7 @@ PID_F=$RUN_D/p910${PORT-0}d.pid
 case $1 in
  start)
   mkdir -p $RUN_D
-  p910nd $OPTIONS
+  p910nd $OPTIONS $PORT
   ;;
  stop)
   [ -f $PID_F ] && kill $(cat $PID_F)
diff --git a/openwrt/package/p910nd/patches/200-p910nd-0.7.patch b/openwrt/package/p910nd/patches/200-p910nd-0.7.patch
index 9e72bd13e82..9165498fe8d 100644
--- a/openwrt/package/p910nd/patches/200-p910nd-0.7.patch
+++ b/openwrt/package/p910nd/patches/200-p910nd-0.7.patch
@@ -1,12 +1,12 @@
-Only in p910nd: p910nd
-diff -u p910nd-0.7/p910nd.c p910nd/p910nd.c
---- p910nd-0.7/p910nd.c	2004-08-09 03:25:01.000000000 +0400
-+++ p910nd/p910nd.c	2005-05-11 00:37:03.385284744 +0400
-@@ -74,7 +74,6 @@
+--- p910nd-0.7/p910nd.c.orig	2005-09-29 11:31:02.442914400 +0200
++++ p910nd-0.7/p910nd.c	2005-09-29 11:31:49.236800648 +0200
+@@ -73,8 +73,7 @@
+ #else
  #define		LOCKFILE	"/var/lock/subsys/p910%cd"
  #endif
- #define		PRINTERFILE	"/dev/lp%c"
+-#define		PRINTERFILE	"/dev/lp%c"
 -#define		LOGOPTS		LOG_ERR
++#define		PRINTERFILE	"/dev/printers/%c"
  
  static char	*progname;
  static char	version[] = "p910nd Version 0.7";