set configuration backends from ifcfg_rh,keyfile to keyfile,ifcfg_rh
install some missing empty directories in /etc/NetworkManager and /etc/sysconfig [release 1.40.10-2mamba;Sat Jan 21 2023]
This commit is contained in:
parent
51ecc21a74
commit
f5a1758c0d
@ -2,7 +2,7 @@
|
||||
%define pppdver %(rpm -q --queryformat '%%{version}\\n' ppp | head -n1)
|
||||
Name: NetworkManager
|
||||
Version: 1.40.10
|
||||
Release: 1mamba
|
||||
Release: 2mamba
|
||||
Summary: A hardware level network management tool integrated with D-Bus
|
||||
Group: System/Kernel and Hardware
|
||||
Vendor: openmamba
|
||||
@ -91,9 +91,11 @@ This package includes the %{name} API documentation.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#-D -T
|
||||
#%patch10 -p1
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
%meson \
|
||||
--libexecdir %{_prefix}/libexec \
|
||||
-D udev_dir=%{_prefix}/lib/udev \
|
||||
@ -139,14 +141,16 @@ install -D -m0644 %{SOURCE1} \
|
||||
%{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d/10-org-freedesktop-network-manager-settings.pkla
|
||||
rm -f %{buildroot}%{_libdir}/libnm-*.a
|
||||
|
||||
install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/VPN
|
||||
install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/system-connections
|
||||
#install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/conf.d
|
||||
#install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/system-connections
|
||||
#install -d -m0755 %{buildroot}%{_sysconfdir}/NetworkManager/VPN
|
||||
#install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
|
||||
|
||||
%{find_lang} %{name}
|
||||
|
||||
cat > %{buildroot}%{_sysconfdir}/NetworkManager/NetworkManager.conf << _EOF
|
||||
[main]
|
||||
plugins=ifcfg-rh,keyfile
|
||||
plugins=keyfile,ifcfg-rh
|
||||
_EOF
|
||||
|
||||
## 1.12.2: built but not installed by make install
|
||||
@ -159,10 +163,14 @@ _EOF
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if [ $1 -gt 1 ]; then
|
||||
# Switch to keyfile as default, ifcfg-rh kept for legacy
|
||||
sed -i "s|plugins=ifcfg-rh,keyfile|plugins=keyfile,ifcfg-rh|" %{_sysconfdir}/NetworkManager/NetworkManager.conf
|
||||
fi
|
||||
if [ $1 -ge 1 ]; then
|
||||
# clean old sysv broken links
|
||||
find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
|
||||
sed -i "s|^plugins=keyfile$|plugins=ifcfg-rh,keyfile|" %{_sysconfdir}/NetworkManager/NetworkManager.conf
|
||||
sed -i "s|^plugins=keyfile$|plugins=keyfile,ifcfg-rh|" %{_sysconfdir}/NetworkManager/NetworkManager.conf
|
||||
systemctl -q enable NetworkManager
|
||||
systemctl -q enable NetworkManager-dispatcher
|
||||
systemctl -q daemon-reload
|
||||
@ -189,9 +197,14 @@ fi
|
||||
%{_sysconfdir}/polkit-1/localauthority/50-local.d/10-org-freedesktop-network-manager-settings.pkla
|
||||
%dir %{_sysconfdir}/NetworkManager
|
||||
%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf
|
||||
%dir %{_sysconfdir}/NetworkManager/conf.d
|
||||
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
|
||||
%dir %{_sysconfdir}/NetworkManager/VPN
|
||||
%dir %{_sysconfdir}/NetworkManager/dispatcher.d/*.d
|
||||
%dir %{_sysconfdir}/NetworkManager/dnsmasq-shared.d
|
||||
%dir %{_sysconfdir}/NetworkManager/dnsmasq.d
|
||||
%dir %{_sysconfdir}/NetworkManager/system-connections
|
||||
#%dir %{_sysconfdir}/NetworkManager/VPN
|
||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||
%{_sbindir}/NetworkManager
|
||||
%{_bindir}/nmcli
|
||||
%{_bindir}/nmtui
|
||||
@ -263,6 +276,10 @@ fi
|
||||
%{_datadir}/doc/NetworkManager/examples/server.conf
|
||||
|
||||
%changelog
|
||||
* Sat Jan 21 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.40.10-2mamba
|
||||
- set configuration backends from ifcfg_rh,keyfile to keyfile,ifcfg_rh
|
||||
- install some missing empty directories in /etc/NetworkManager and /etc/sysconfig
|
||||
|
||||
* Wed Jan 11 2023 Automatic Build System <autodist@mambasoft.it> 1.40.10-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user