summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkloczek2001-07-19 01:24:29 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitf5cbaaad5680de5f858e5a6ed094aaec77acbf35 (patch)
treeaf53e39086761ebd7828afa705fe9b15e288c5ea
downloadnut1-nut-0_45_1-1.zip
nut1-nut-0_45_1-1.tar.gz
- merge some rawhide patches.nut-0_45_1-1nut-0_45_0-3
Changed files: nut-client.patch -> 1.1 nut-config.patch -> 1.1
-rw-r--r--nut-client.patch11
-rw-r--r--nut-config.patch15
2 files changed, 26 insertions, 0 deletions
diff --git a/nut-client.patch b/nut-client.patch
new file mode 100644
index 0000000..aa09055
--- /dev/null
+++ b/nut-client.patch
@@ -0,0 +1,11 @@
+--- nut-0.45.0/clients/Makefile.in.orig Wed Jun 13 11:37:04 2001
++++ nut-0.45.0/clients/Makefile.in Wed Jun 13 11:37:21 2001
+@@ -11,7 +11,7 @@
+ CC = @CC@
+ CFLAGS = -I../include @CFLAGS@
+ PROGS = upsc upslog upsct upsct2 upscmd
+-SPROGS = upsmon upssched
++SPROGS = upsmon upssched upssched-cmd
+ CGIPROGS = upsstats.cgi upsimage.cgi multimon.cgi upsset.cgi
+ LIBOBJ = @LIBOBJ@ @NETLIBS@
+
diff --git a/nut-config.patch b/nut-config.patch
new file mode 100644
index 0000000..bb85416
--- /dev/null
+++ b/nut-config.patch
@@ -0,0 +1,15 @@
+--- nut-0.44.1/conf/upsd.conf.orig Thu Jul 20 21:22:13 2000
++++ nut-0.44.1/conf/upsd.conf Sat Oct 21 17:03:57 2000
+@@ -4,9 +4,9 @@
+ # Having it owned by root, mode 0600 should be sufficient.
+
+ # UPS <identifier> <statepath>/<model>-<port> [ <model> [<command line arguments>] <port> ]
+-# UPS myups /var/state/ups/apcsmart-ttyS1 apcsmart /dev/ttyS1
+-# UPS myups /var/state/ups/fentonups-tty00
+-# UPS myups /var/state/ups/genericups-cuaa1 genericups -t 1 /dev/cuaa1
++# UPS myups /var/lib/ups/apcsmart-ttyS1 apcsmart /dev/ttyS1
++# UPS myups /var/lib/ups/fentonups-tty00
++# UPS myups /var/lib/ups/genericups-cuaa1 genericups -t 1 /dev/cuaa1
+ #
+ # Use this to specify which state files to monitor based on the model
+ # support modules being run. The identifier isn't important unless