mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-20 17:55:49 +00:00
contrib/rpm: ship a different readme when ifcfg migration is enabled
Ship a different file in /etc/sysconfig/network-scripts to warn that migration is enabled.
This commit is contained in:
parent
8f438d8d08
commit
c3ca0b90cd
|
@ -164,7 +164,7 @@
|
||||||
%global split_ifcfg_rh 0
|
%global split_ifcfg_rh 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
|
%if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} >= 9
|
||||||
%global ifcfg_warning 1
|
%global ifcfg_warning 1
|
||||||
%else
|
%else
|
||||||
%global ifcfg_warning 0
|
%global ifcfg_warning 0
|
||||||
|
@ -211,6 +211,7 @@ Source4: 20-connectivity-fedora.conf
|
||||||
Source5: 20-connectivity-redhat.conf
|
Source5: 20-connectivity-redhat.conf
|
||||||
Source6: 70-nm-connectivity.conf
|
Source6: 70-nm-connectivity.conf
|
||||||
Source7: readme-ifcfg-rh.txt
|
Source7: readme-ifcfg-rh.txt
|
||||||
|
Source8: readme-ifcfg-rh-migrated.txt
|
||||||
|
|
||||||
#Patch1: 0001-some.patch
|
#Patch1: 0001-some.patch
|
||||||
|
|
||||||
|
@ -934,6 +935,9 @@ cp %{SOURCE6} %{buildroot}%{_sysctldir}
|
||||||
%if 0%{?ifcfg_warning}
|
%if 0%{?ifcfg_warning}
|
||||||
cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
|
cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?ifcfg_migrate}
|
||||||
|
cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
|
||||||
|
%endif
|
||||||
|
|
||||||
cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
|
cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
|
||||||
ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
|
ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
|
||||||
|
@ -1125,7 +1129,7 @@ fi
|
||||||
%{_unitdir}/nm-priv-helper.service
|
%{_unitdir}/nm-priv-helper.service
|
||||||
%dir %{_datadir}/doc/NetworkManager/examples
|
%dir %{_datadir}/doc/NetworkManager/examples
|
||||||
%{_datadir}/doc/NetworkManager/examples/server.conf
|
%{_datadir}/doc/NetworkManager/examples/server.conf
|
||||||
%if 0%{?ifcfg_warning}
|
%if 0%{?ifcfg_warning} || 0%{?ifcfg_migrate}
|
||||||
%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
|
%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
|
||||||
%endif
|
%endif
|
||||||
%doc NEWS AUTHORS README.md CONTRIBUTING.md
|
%doc NEWS AUTHORS README.md CONTRIBUTING.md
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
# SOURCE_CONFIG_CONNECTIVITY_REDHAT=
|
# SOURCE_CONFIG_CONNECTIVITY_REDHAT=
|
||||||
# SOURCE_SYSCTL_RP_FILTER_REDHAT=
|
# SOURCE_SYSCTL_RP_FILTER_REDHAT=
|
||||||
# SOURCE_README_IFCFG_FILES=
|
# SOURCE_README_IFCFG_FILES=
|
||||||
|
# SOURCE_README_IFCFG_MIGRATED=
|
||||||
# SIGN_SOURCE=
|
# SIGN_SOURCE=
|
||||||
# DO_RELEASE=
|
# DO_RELEASE=
|
||||||
# BCOND_DEFAULT_DEBUG=
|
# BCOND_DEFAULT_DEBUG=
|
||||||
|
@ -146,6 +147,7 @@ SOURCE_CONFIG_CONNECTIVITY_FEDORA="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_FEDOR
|
||||||
SOURCE_CONFIG_CONNECTIVITY_REDHAT="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$SCRIPTDIR/20-connectivity-redhat.conf")" || die "invalid \$SOURCE_CONFIG_CONNECTIVITY_REDHAT argument"
|
SOURCE_CONFIG_CONNECTIVITY_REDHAT="$(abs_path "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$SCRIPTDIR/20-connectivity-redhat.conf")" || die "invalid \$SOURCE_CONFIG_CONNECTIVITY_REDHAT argument"
|
||||||
SOURCE_SYSCTL_RP_FILTER_REDHAT="$(abs_path "$SOURCE_SYSCTL_RP_FILTER_REDHAT" "$SCRIPTDIR/70-nm-connectivity.conf")" || die "invalid \$SOURCE_SYSCTL_RP_FILTER_REDHAT argument"
|
SOURCE_SYSCTL_RP_FILTER_REDHAT="$(abs_path "$SOURCE_SYSCTL_RP_FILTER_REDHAT" "$SCRIPTDIR/70-nm-connectivity.conf")" || die "invalid \$SOURCE_SYSCTL_RP_FILTER_REDHAT argument"
|
||||||
SOURCE_README_IFCFG_FILES="$(abs_path "$SOURCE_README_IFCFG_FILES" "$SCRIPTDIR/readme-ifcfg-rh.txt")" || die "invalid \$SOURCE_README_IFCFG_FILES argument"
|
SOURCE_README_IFCFG_FILES="$(abs_path "$SOURCE_README_IFCFG_FILES" "$SCRIPTDIR/readme-ifcfg-rh.txt")" || die "invalid \$SOURCE_README_IFCFG_FILES argument"
|
||||||
|
SOURCE_README_IFCFG_MIGRATED="$(abs_path "$SOURCE_README_IFCFG_MIGRATED" "$SCRIPTDIR/readme-ifcfg-rh-migrated.txt")" || die "invalid \$SOURCE_README_IFCFG_MIGRATED argument"
|
||||||
|
|
||||||
TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")"
|
TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")"
|
||||||
TEMPBASE="$(basename "$TEMP")"
|
TEMPBASE="$(basename "$TEMP")"
|
||||||
|
@ -173,6 +175,7 @@ LOG "SOURCE_CONFIG_CONNECTIVITY_FEDORA=$SOURCE_CONFIG_CONNECTIVITY_FEDORA"
|
||||||
LOG "SOURCE_CONFIG_CONNECTIVITY_REDHAT=$SOURCE_CONFIG_CONNECTIVITY_REDHAT"
|
LOG "SOURCE_CONFIG_CONNECTIVITY_REDHAT=$SOURCE_CONFIG_CONNECTIVITY_REDHAT"
|
||||||
LOG "SOURCE_SYSCTL_RP_FILTER_REDHAT=$SOURCE_SYSCTL_RP_FILTER_REDHAT"
|
LOG "SOURCE_SYSCTL_RP_FILTER_REDHAT=$SOURCE_SYSCTL_RP_FILTER_REDHAT"
|
||||||
LOG "SOURCE_README_IFCFG_FILES=$SOURCE_README_IFCFG_FILES"
|
LOG "SOURCE_README_IFCFG_FILES=$SOURCE_README_IFCFG_FILES"
|
||||||
|
LOG "SOURCE_README_IFCFG_MIGRATED=$SOURCE_README_IFCFG_MIGRATED"
|
||||||
LOG "BUILDTYPE=$BUILDTYPE"
|
LOG "BUILDTYPE=$BUILDTYPE"
|
||||||
LOG "NM_RPMBUILD_ARGS=$NM_RPMBUILD_ARGS"
|
LOG "NM_RPMBUILD_ARGS=$NM_RPMBUILD_ARGS"
|
||||||
LOG "BCOND_DEFAULT_DEBUG=$BCOND_DEFAULT_DEBUG"
|
LOG "BCOND_DEFAULT_DEBUG=$BCOND_DEFAULT_DEBUG"
|
||||||
|
@ -202,6 +205,7 @@ cp "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$TEMP/SOURCES/20-connectivity-fedora.co
|
||||||
cp "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$TEMP/SOURCES/20-connectivity-redhat.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_REDHAT to $TEMP/SOURCES"
|
cp "$SOURCE_CONFIG_CONNECTIVITY_REDHAT" "$TEMP/SOURCES/20-connectivity-redhat.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_REDHAT to $TEMP/SOURCES"
|
||||||
cp "$SOURCE_SYSCTL_RP_FILTER_REDHAT" "$TEMP/SOURCES/70-nm-connectivity.conf" || die "Could not copy source $SOURCE_SYSCTL_RP_FILTER_REDHAT to $TEMP/SOURCES"
|
cp "$SOURCE_SYSCTL_RP_FILTER_REDHAT" "$TEMP/SOURCES/70-nm-connectivity.conf" || die "Could not copy source $SOURCE_SYSCTL_RP_FILTER_REDHAT to $TEMP/SOURCES"
|
||||||
cp "$SOURCE_README_IFCFG_FILES" "$TEMP/SOURCES/readme-ifcfg-rh.txt" || die "Could not copy source $SOURCE_README_IFCFG_FILES to $TEMP/SOURCES"
|
cp "$SOURCE_README_IFCFG_FILES" "$TEMP/SOURCES/readme-ifcfg-rh.txt" || die "Could not copy source $SOURCE_README_IFCFG_FILES to $TEMP/SOURCES"
|
||||||
|
cp "$SOURCE_README_IFCFG_MIGRATED" "$TEMP/SOURCES/readme-ifcfg-rh-migrated.txt" || die "Could not copy source $SOURCE_README_IFCFG_MIGRATED to $TEMP/SOURCES"
|
||||||
|
|
||||||
write_changelog
|
write_changelog
|
||||||
|
|
||||||
|
|
52
contrib/fedora/rpm/readme-ifcfg-rh-migrated.txt
Normal file
52
contrib/fedora/rpm/readme-ifcfg-rh-migrated.txt
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
NetworkManager was built to automatically migrate connection profiles in
|
||||||
|
this directory to equivalent ones in keyfile format in directory
|
||||||
|
/etc/NetworkManager/system-connections.
|
||||||
|
|
||||||
|
You can check whether the migration is enabled via:
|
||||||
|
|
||||||
|
$ NetworkManager --print-config | grep migrate-ifcfg-rh
|
||||||
|
|
||||||
|
In case it is enabled, all files in this directory are migrated at startup.
|
||||||
|
|
||||||
|
To inspect where your connection files are currently stored use:
|
||||||
|
|
||||||
|
$ nmcli -f name,uuid,filename connection
|
||||||
|
|
||||||
|
Background
|
||||||
|
==========
|
||||||
|
|
||||||
|
The ifcfg format is deprecated and will be removed in future releases. For
|
||||||
|
more information see:
|
||||||
|
|
||||||
|
https://lists.freedesktop.org/archives/networkmanager/2023-May/000103.html
|
||||||
|
|
||||||
|
Connection profiles in keyfile format have many benefits. For example, this
|
||||||
|
format is INI file-based and can easily be parsed and generated.
|
||||||
|
|
||||||
|
Each section in NetworkManager keyfiles corresponds to a NetworkManager
|
||||||
|
setting name as described in the nm-settings(5) and nm-settings-keyfile(5)
|
||||||
|
man pages. Each key-value pair in a section is one of the properties listed
|
||||||
|
in the settings specification of the man page.
|
||||||
|
|
||||||
|
How to keep using ifcfg
|
||||||
|
=======================
|
||||||
|
|
||||||
|
If you want to keep using connection profiles in ifcfg format, you need to:
|
||||||
|
|
||||||
|
- disable the automatic migration to keyfile by setting
|
||||||
|
"migrate-ifcfg-rh=false" in the [main] section of NetworkManager
|
||||||
|
configuration;
|
||||||
|
|
||||||
|
- optionally, set "plugins=ifcfg-rh" in the [main] section of
|
||||||
|
NetworkManager configuration so that new profiles are created in ifcfg
|
||||||
|
format.
|
||||||
|
|
||||||
|
At this point, you can migrate all your files back via
|
||||||
|
|
||||||
|
nmcli connection migrate --plugin ifcfg-rh
|
||||||
|
|
||||||
|
Or, if you prefer to migrate only specific connections:
|
||||||
|
|
||||||
|
nmcli connection migrate --plugin ifcfg-rh <profile_name|UUID>
|
||||||
|
|
||||||
|
Note that some connection types are not supported by the ifcfg plugin.
|
Loading…
Reference in a new issue