systemd-sysconfig.patch

   1 --- nut-2.6.4/scripts/systemd/nut-server.service.in.orig        2012-06-23 23:05:33.638939671 +0200
   2 +++ nut-2.6.4/scripts/systemd/nut-server.service.in     2012-06-23 23:13:37.038936168 +0200
   3 @@ -5,7 +5,8 @@
   4  Before=nut-monitor.service
   5
   6  [Service]
   7 -ExecStart=@SBINDIR@/upsd
   8 +EnvironmentFile=-/etc/sysconfig/ups
   9 +ExecStart=@SBINDIR@/upsd $UPSD_OPTIONS
  10  Type=forking
  11
  12  [Install]
  13 --- nut-2.6.4/scripts/systemd/nut-monitor.service.in.orig       2012-05-02 23:35:36.000000000 +0200
  14 +++ nut-2.6.4/scripts/systemd/nut-monitor.service.in    2012-06-23 23:14:10.582269261 +0200
  15 @@ -3,7 +3,8 @@
  16  After=local-fs.target network.target nut-server.service
  17
  18  [Service]
  19 -ExecStart=@SBINDIR@/upsmon
  20 +EnvironmentFile=-/etc/sysconfig/upsmon
  21 +ExecStart=@SBINDIR@/upsmon $PROGRAM_ARGS
  22  PIDFile=@PIDPATH@/upsmon.pid
  23  Type=forking
  24
  25 --- nut-2.6.5/configure.ac~     2012-08-06 14:37:36.000000000 +0200
  26 +++ nut-2.6.5/configure.ac      2013-01-13 12:42:30.807862312 +0100
  27 @@ -986,9 +986,8 @@
  28  dnl prefix. This is needed for 'distcheck*' targets, otherwise
  29  dnl files will try to get intalled to the actual system directories
  30  if test -n "${systemdsystemunitdir}"; then
  31 -       systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
  32 +       systemdsystemshutdowndir="/lib/systemd/system-shutdown"
  33         AC_MSG_RESULT(using ${systemdsystemunitdir})
  34 -       systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
  35  else
  36         AC_MSG_RESULT(no)
  37  fi