--- rpms/e-smith-packetfilter/sme10/e-smith-packetfilter-2.6.0bz11426-ulogd.patch	2021/03/04 21:43:34	1.1
+++ rpms/e-smith-packetfilter/sme10/e-smith-packetfilter-2.6.0bz11426-ulogd.patch	2021/03/05 04:43:29	1.2
@@ -1,7 +1,7 @@
 diff -Nur e-smith-packetfilter-2.6.0.old/createlinks e-smith-packetfilter-2.6.0/createlinks
 --- e-smith-packetfilter-2.6.0.old/createlinks	2021-03-04 16:01:39.921000000 -0500
-+++ e-smith-packetfilter-2.6.0/createlinks	2021-03-04 16:41:51.234000000 -0500
-@@ -21,18 +21,8 @@
++++ e-smith-packetfilter-2.6.0/createlinks	2021-03-04 16:52:55.378000000 -0500
+@@ -21,18 +21,10 @@
      safe_symlink("reload", "root/etc/e-smith/events/$_/services2adjust/masq");
  }
  
@@ -11,17 +11,20 @@ diff -Nur e-smith-packetfilter-2.6.0.old
 -    # But, after the bootstrap-console has had a chance to configure masq
 -    masq 	=> "36",
 -);
-+    safe_symlink("restart", "root/etc/e-smith/events/e-smith-packetfilter-update/services2adjust/ulogd");
- 
+-
 -foreach my $service (keys %service2order)
 -{
 -# removed for systemd
 -#    service_link_enhanced($service, $service2order{$service}, 7);
 -}
++my $event ="e-smith-packetfilter-update";
++safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ulogd");
++event_link("systemd-reload", $event, "89");
++event_link("systemd-default", $event, "88");
  
  #systemd
  foreach my $target (qw(multi-user sme-server))
-@@ -41,6 +31,7 @@
+@@ -41,6 +33,7 @@
  
  foreach my $unit (qw(
          masq.service
@@ -46,12 +49,12 @@ diff -Nur e-smith-packetfilter-2.6.0.old
 +enabled
 diff -Nur e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/basic e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic
 --- e-smith-packetfilter-2.6.0.old/root/etc/e-smith/templates/etc/ulogd.conf/basic	2008-10-07 13:36:41.000000000 -0400
-+++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic	2021-03-04 16:34:43.379000000 -0500
++++ e-smith-packetfilter-2.6.0/root/etc/e-smith/templates/etc/ulogd.conf/basic	2021-03-04 23:22:10.840000000 -0500
 @@ -1,12 +1,125 @@
  [global]
  nlgroup=1
 -logfile=/dev/stdout
-+logfile=/var/log/ulogd/ulogd.log
++logfile=/var/log/iptables/ulogd.log
  loglevel=5
  rmem=131071
  bufsize=150000
@@ -173,7 +176,7 @@ diff -Nur e-smith-packetfilter-2.6.0.old
 +}
  [LOGEMU]
 -file="/dev/stdout"
-+file="/var/log/ulogd/ulogd.syslogemu"
++file="/var/log/iptables/ulogd.syslogemu"
  sync=1
 diff -Nur e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf
 --- e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/sme-server.target.d/53koozali.conf	1969-12-31 19:00:00.000000000 -0500
@@ -184,16 +187,22 @@ diff -Nur e-smith-packetfilter-2.6.0.old
 +
 diff -Nur e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/ulogd.service e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service
 --- e-smith-packetfilter-2.6.0.old/root/usr/lib/systemd/system/ulogd.service	1969-12-31 19:00:00.000000000 -0500
-+++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service	2021-03-04 16:14:51.769000000 -0500
-@@ -0,0 +1,11 @@
++++ e-smith-packetfilter-2.6.0/root/usr/lib/systemd/system/ulogd.service	2021-03-04 23:43:02.018000000 -0500
+@@ -0,0 +1,17 @@
 +[Unit]
 +Description=Netfilter Userspace Logging Daemon
 +Before=masq.service
 +
 +[Service]
++User=root
++Group=root
++Restart=always
++TimeoutSec=0
 +Type=forking
-+PIDFile=/run/ulog/ulogd.pid
-+ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid
++
++#PIDFile=/run/ulog/ulogd.pid
++#ExecStart=/usr/sbin/ulogd --daemon --uid ulog --pidfile /run/ulog/ulogd.pid
++ExecStart=/usr/sbin/ulogd --daemon
 +
 +[Install]
 +WantedBy=sme-server.target multi-user.target