* Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme

- add requirement for ppp [SME: 12622]
- add requirement for rp-pppoe [SME: 12628]
- enable modprobe dummy and bond [SME: 12627]
This commit is contained in:
Jean-Philippe Pialasse 2024-04-16 15:50:13 -04:00
parent cae29fee3b
commit dbc88b9a2c
6 changed files with 39 additions and 2 deletions

View File

@ -64,6 +64,7 @@ foreach (qw(
/etc/resolv.conf
/etc/sysctl.conf
/var/service/wan/dhclient.config
/lib/modprobe.d/systemd.conf
))
{
templates2events($_, qw(console-save bootstrap-console-save smeserver-base-update));

View File

@ -0,0 +1,18 @@
# SPDX-License-Identifier: LGPL-2.1+
#
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# When bonding module is loaded, it creates bond0 by default due to max_bonds
# option default value 1. This interferes with the network configuration
# management / networkd, as it is not possible to detect whether this bond0 was
# intentionally configured by the user, or should be managed by
# networkd/NM/etc. Therefore disable bond0 creation.
# KOOZALI SME Server we do use it, and do not use NM, so enabling
options bonding max_bonds=1

View File

@ -0,0 +1,5 @@
# Do the same for dummy0.
# KOOZALI SME Server,we do use it too, so enabling
options dummy numdummies=1

View File

@ -0,0 +1,4 @@
#!/bin/bash
# make sure that dummy driver is enabled
/usr/sbin/lsmod |/usr/bin/grep -q dummy || /usr/sbin/modprobe dummy numdummies=1

View File

@ -7,6 +7,7 @@ Conflicts=NetworkManager.service
[Service]
Type=oneshot
ExecStartPre=/sbin/e-smith/systemd/network-pre
ExecStart=/etc/rc.d/init.d/network start
ExecStop=/etc/rc.d/init.d/network stop
ExecReload=/etc/rc.d/init.d/network restart

View File

@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
%define name smeserver-base
Name: %{name}
%define version 11.0.0
%define release 7
%define release 8
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -39,6 +39,7 @@ Requires: smeserver-bootloader
Requires: mdadm
Requires: pv
Requires: dhcp-server
Requires: dhcp-client
Requires: diald
Requires: /usr/bin/passwd
Requires: nss-pam-ldapd
@ -63,7 +64,8 @@ BuildRequires: perl, perl(Test::Inline) >= 0.12
BuildRequires: smeserver-devtools >= 1.13.1-03
BuildRequires: gettext
Requires: gdisk
Requires: ppp
Requires: rp-pppoe
%define dbfiles accounts configuration domains hosts networks
AutoReqProv: no
@ -101,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/selinux
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--file /sbin/e-smith/systemd/network-pre 'attr(0554,root,root)' \
--file /sbin/e-smith/systemd/mdmonitor-pre 'attr(0554,root,root)' \
--file /sbin/e-smith/systemd/rsyslog-pre 'attr(0554,root,root)' \
--file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
@ -181,6 +184,11 @@ fi
%changelog
* Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- add requirement for ppp [SME: 12622]
- add requirement for rp-pppoe [SME: 12628]
- enable modprobe dummy and bond [SME: 12627]
* Sat Apr 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- fix init-accounts [SME: 12546]