/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11091-wan.service.patch
ViewVC logotype

Diff of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11091-wan.service.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Wed Nov 11 20:47:30 2020 UTC Revision 1.2 by jpp, Wed Nov 11 20:50:41 2020 UTC
# Line 14  diff -Nur e-smith-base-5.8.0.old/createl Line 14  diff -Nur e-smith-base-5.8.0.old/createl
14   # conf-dialup   # conf-dialup
15   foreach (qw(   foreach (qw(
16       /etc/sysconfig/network-scripts/ifcfg-ppp0       /etc/sysconfig/network-scripts/ifcfg-ppp0
 @@ -322,6 +316,7 @@  
  event_link("create-mnt-floppy", $event, "50");  
  event_link("conf-routes", $event, "89");  
  event_link("systemd-isolate", $event, "94");  
 +event_link("systemd-reload", $event, "94");  
  event_link("reset-unsavedflag", $event, "95");  
   
  safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network");  
 @@ -342,6 +337,7 @@  
  event_link("set-hostname", $event, "10");  
  event_link("conf-modules", $event, "30");  
  event_link("conf-startup", $event, "60");  
 +event_link("systemd-reload", $event, "94");  
  event_link("reset-unsavedflag", $event, "95");  
   
  safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan");  
 @@ -373,6 +369,7 @@  
  event_link("systemd-default", $event, "05");  
  event_link("user-lock-passwd", $event, "15");  
  event_link("user-modify-unix", $event, "15");  
 +event_link("systemd-reload", $event, "94");  
   
  #--------------------------------------------------  
  # actions for group-create event  
 @@ -446,6 +443,7 @@  
  event_link("conf-startup", $event, "10");  
  event_link("conf-modules", $event, "30");  
  event_link("create-mnt-floppy", $event, "50");  
 +event_link("systemd-reload", $event, "94");  
   
  #--------------------------------------------------  
  # actions for post-upgrade event  
 @@ -465,6 +463,7 @@  
  event_link("conf-modules", $event, "30");  
  event_link("create-mnt-floppy", $event, "50");  
  event_link("copy-anaconda-logs", $event, "90");  
 +event_link("systemd-reload", $event, "94");  
   
  #--------------------------------------------------  
  # actions for reboot event  
 @@ -607,7 +606,6 @@  
  (  
      # Start rsyslog up before network!  
      raidmonitor => "15",  
 -    network    => "37",  
      dhcpd      => "65",  
      'local'            => "99",  
  );  
 @@ -658,6 +656,8 @@  
         systemd-logind.service  
         systemd-update-utmp-runlevel.service  
         systemd-user-sessions.service  
 +       networking.service  
 +       wan.service  
         ))  
         {  
         symlink("../$unit",  
 diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default  
 --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default      2020-11-11 14:07:33.347000000 -0500  
 +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default  2020-11-11 14:50:01.589000000 -0500  
 @@ -1,5 +1,5 @@  
  #!/usr/bin/bash  
  /usr/bin/systemctl  enable sme-server.target  
 +ln -fs sme-server.target /lib/systemd/system/default.target  
 +/usr/bin/systemctl  preset-all  
  /usr/bin/systemctl  set-default sme-server.target  
 -# /usr/bin/systemctl  disable multi-user.target  
 -  
 diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-reload e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-reload  
 --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-reload       1969-12-31 19:00:00.000000000 -0500  
 +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-reload   2020-11-11 14:51:32.777000000 -0500  
 @@ -0,0 +1,2 @@  
 +#!/usr/bin/bash  
 +/usr/bin/systemctl daemon-reload  
 diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/networking.service e-smith-base-5.8.0/root/usr/lib/systemd/system/networking.service  
 --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/networking.service       1969-12-31 19:00:00.000000000 -0500  
 +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/networking.service   2020-11-11 14:54:37.816000000 -0500  
 @@ -0,0 +1,17 @@  
 +[Unit]  
 +Description= Network management for Koozali SME Server, using old sysvinit script  
 +After=network-pre.target  
 +Wants=network.target  
 +Before=network-online.target wan.service  
 +Conflicts=NetworkManager.service  
 +  
 +[Service]  
 +Type=oneshot  
 +ExecStart=/etc/rc.d/init.d/network start  
 +ExecStop=/etc/rc.d/init.d/network stop  
 +ExecReload=/etc/rc.d/init.d/network restart  
 +RemainAfterExit=yes  
 +  
 +[Install]  
 +WantedBy=sme-server.target  
 +Alias=network.service  
17  diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service  diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service
18  --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service      1969-12-31 19:00:00.000000000 -0500  --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service      1969-12-31 19:00:00.000000000 -0500
19  +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service  2020-11-11 15:32:34.522000000 -0500  +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service  2020-11-11 15:32:34.522000000 -0500
# Line 128  diff -Nur e-smith-base-5.8.0.old/root/us Line 33  diff -Nur e-smith-base-5.8.0.old/root/us
33  +  +
34  +[Install]  +[Install]
35  +WantedBy=sme-server.target  +WantedBy=sme-server.target
 diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50koozali.preset  
 --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50koozali.preset  1969-12-31 19:00:00.000000000 -0500  
 +++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50koozali.preset      2020-11-11 15:34:43.681000000 -0500  
 @@ -0,0 +1,18 @@  
 +enable sme-server.target  
 +disable multi-user.target  
 +disable graphical.target  
 +  
 +enable runit.service  
 +enable bootstrap-console.service  
 +enable networking.service  
 +enable wan.service  
 +enable masq.service  
 +enable php-fpm.service  
 +enable php55-php-fpm.service  
 +enable php56-php-fpm.service  
 +enable php70-php-fpm.service  
 +enable php71-php-fpm.service  
 +enable php72-php-fpm.service  
 +enable php73-php-fpm.service  
 +enable php74-php-fpm.service  
 +  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed