Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fedora-sysv/initscripts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10.24
Choose a base ref
...
head repository: fedora-sysv/initscripts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10.25
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 25, 2024

  1. Revert "fix: return support for network-scripts for Fedora 40"

    This reverts commit 4ef61c6.
    
    Fedora 41 Change Proposal: https://fedoraproject.org/wiki/Changes/NetworkScriptsRemoval
    jamacku committed Jun 25, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    chenrui333 Rui Chen
    Copy the full SHA
    7df9a84 View commit details
  2. 10.25

    jamacku committed Jun 25, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    f35ab7a View commit details
Showing with 6 additions and 105 deletions.
  1. +6 −105 initscripts.spec
111 changes: 6 additions & 105 deletions initscripts.spec
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ Requires: gawk \

Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.24
Version: 10.25
Release: 1%{?dist}

License: GPL-2.0-only
@@ -55,6 +55,7 @@ BuildRequires: make
BuildRequires: systemd

Obsoletes: %{name} < 10.16-1
Obsoletes: network-scripts < 10.25-1

# === PATCHES =================================================================

@@ -115,57 +116,6 @@ This package provides service command.

# ---------------

%package -n network-scripts
Summary: Legacy scripts for manipulating of network devices
Requires: %{name}%{?_isa} = %{version}-%{release}

%shared_requirements

Requires: bc
Requires: dbus
Requires: dbus-tools
Requires: gawk
Requires: grep
Requires: hostname
Requires: iproute
Requires: ipcalc
Requires: kmod
Requires: procps-ng
Requires: sed
Requires: systemd

Requires(post): chkconfig
Requires(preun): chkconfig

Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives

Obsoletes: %{name} < 9.82-2

# This is legacy and deprecated, so nobody should depend on this!
# If ifcfg-style configuration is still desired, NetworkManager can do this.
# Thus, mark this as deprecated to ensure people know to not depend on it.
# Cf. https://docs.fedoraproject.org/en-US/packaging-guidelines/deprecating-packages/
Provides: deprecated()

%description -n network-scripts
This package contains the legacy scripts for activating & deactivating of most
network interfaces. It also provides a legacy version of 'network' service.

The 'network' service is enabled by default after installation of this package,
and if the network-scripts are installed alongside NetworkManager, then the
ifup/ifdown commands from network-scripts take precedence over the ones provided
by NetworkManager.

If user has both network-scripts & NetworkManager installed, and wishes to
use ifup/ifdown from NetworkManager primarily, then they has to run command:
$ update-alternatives --config ifup

Please note that running the command above will also disable the 'network'
service.

# ---------------

%package -n netconsole-service
Summary: Service for initializing of network console logging
Requires: %{name} = %{version}-%{release}
@@ -225,25 +175,11 @@ Please use systemd-volatile-root functionality instead, if possible.
# ---------------

%install
%make_install
%make_install NO_NETWORK_SCRIPTS=true

# This installs the NLS language files:
%find_lang %{name}

%ifnarch s390 s390x
rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
%endif

# Additional ways to access documentation:
install -m 0755 -d %{buildroot}%{_docdir}/network-scripts

ln -s %{_docdir}/%{name}/sysconfig.txt %{buildroot}%{_docdir}/network-scripts/
ln -sr %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8

# We are now using alternatives approach to better co-exist with NetworkManager:
touch %{buildroot}%{_sbindir}/ifup
touch %{buildroot}%{_sbindir}/ifdown

%if "%{_sbindir}" == "%{_bindir}"
# Some files get installed wrong, but if $(sbindir) is overriden, the build fails :(
mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
@@ -262,24 +198,6 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/

# ---------------

%post -n network-scripts
chkconfig --add network > /dev/null 2>&1 || :

[ -L %{_sbindir}/ifup ] || rm -f %{_sbindir}/ifup
[ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown

%{_sbindir}/update-alternatives --install %{_sbindir}/ifup ifup %{_sysconfdir}/sysconfig/network-scripts/ifup 90 \
--slave %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \
--initscript network

%preun -n network-scripts
if [ $1 -eq 0 ]; then
chkconfig --del network > /dev/null 2>&1 || :
%{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup
fi

# ---------------

%post -n netconsole-service
%systemd_post netconsole.service

@@ -360,26 +278,6 @@ fi

# ---------------

%files -n network-scripts
%doc doc/examples/
%dir %{_sysconfdir}/sysconfig/network-scripts

%{_sysconfdir}/rc.d/init.d/network
%{_sysconfdir}/sysconfig/network-scripts/*

%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo

%ghost %{_sbindir}/ifup
%ghost %{_sbindir}/ifdown
%attr(4755,root,root) %{_sbindir}/usernetctl

%{_mandir}/man8/ifup.*
%{_mandir}/man8/ifdown.*
%{_mandir}/man8/usernetctl.*
%{_docdir}/network-scripts/*

# ---------------

%files -n netconsole-service
%config(noreplace) %{_sysconfdir}/sysconfig/netconsole

@@ -403,6 +301,9 @@ fi
# =============================================================================

%changelog
* Tue Jun 25 2024 Jan Macku <jamacku@redhat.com> - 10.25-1
- Revert "fix: return support for network-scripts for Fedora 40"

* Wed May 29 2024 Jan Macku <jamacku@redhat.com> - 10.24-1
- Fix build when %_bindir==%_sbindir