rpms/nut/devel nut-2.2.0-udevusb.patch, 1.2, 1.3 nut.spec, 1.49, 1.50 ups.init, 1.9, 1.10
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Wed Nov 28 11:23:25 UTC 2007
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32561
Modified Files:
nut-2.2.0-udevusb.patch nut.spec ups.init
Log Message:
* Wed Nov 28 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-6
- fix forgotten bug in init script
nut-2.2.0-udevusb.patch:
Index: nut-2.2.0-udevusb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut-2.2.0-udevusb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nut-2.2.0-udevusb.patch 27 Nov 2007 12:21:10 -0000 1.2
+++ nut-2.2.0-udevusb.patch 28 Nov 2007 11:22:50 -0000 1.3
@@ -1,6 +1,6 @@
diff -up nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.0/scripts/udev/nut-usbups.rules.in
--- nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb 2007-05-14 18:16:22.000000000 +0200
-+++ nut-2.2.0/scripts/udev/nut-usbups.rules.in 2007-11-27 09:31:16.000000000 +0100
++++ nut-2.2.0/scripts/udev/nut-usbups.rules.in 2007-11-27 14:37:33.000000000 +0100
@@ -1,61 +1,61 @@
# udev rules for the NUT USB drivers
@@ -11,52 +11,52 @@
# MGE UPS SYSTEMS - usbhid-ups
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
# APC - usbhid-ups
-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
# CyberPower - usbhid-ups
-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
# Mustek Powermust 600USB (OMRON/87XXUPS)
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
# Cypress Semiconductor USB to Serial
-SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
# Powercom - unknown driver
-SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
# Agiler - megatec_usb
-SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
# Krauler - megatec_usb
-SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
# Ablerex - megatec_usb
-SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
# Powerware - bcmxcp_usb
-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
# Tripp Lite - tripplite_usb
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
# Tripp Lite - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
@@ -64,11 +64,11 @@
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
# Belkin - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
@@ -77,16 +77,16 @@
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="uucp"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
# Kebo - unsupported
-SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
LABEL="nut-usbups_rules_end"
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nut.spec 27 Nov 2007 12:21:10 -0000 1.49
+++ nut.spec 28 Nov 2007 11:22:50 -0000 1.50
@@ -301,6 +301,9 @@
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Wed Nov 28 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-6
+- fix forgotten bug in init script
+
* Tue Nov 27 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5
- fix udev rules and hal information files
- fix init script
Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/ups.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ups.init 27 Nov 2007 12:21:10 -0000 1.9
+++ ups.init 28 Nov 2007 11:22:50 -0000 1.10
@@ -116,15 +116,7 @@
status)
if [ "$SERVER" = "yes" ]; then
- if [ "$MODEL" = "upsdrvctl" ]; then
- # show status of each configured driver
- for MYMODEL in $(egrep '^[[:space:]]*driver' /etc/ups/ups.conf \
- | sed 's/.*=[[:space:]]*//'); do
- status $MYMODEL
- done
- else
- status $MODEL
- fi
+ status upsdrvctl
status upsd
fi
status upsmon
More information about the fedora-extras-commits
mailing list