Browse code
Disable network interface renamin in systemd
Change-Id: I68ffc4a48386afa97d86ffd69f3c568832255e4a
Reviewed-on: http://photon-jenkins.eng.vmware.com/711
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
Vinay Kulkarni authored on 2016/04/13 05:00:08Showing 2 changed files
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux |
| 4 | 4 |
Version: 4.2.0 |
| 5 |
-Release: 24%{?dist}
|
|
| 5 |
+Release: 25%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -109,7 +109,7 @@ cp -v .config %{buildroot}/boot/config-%{version}
|
| 109 | 109 |
cp -r Documentation/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
| 110 | 110 |
cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"
|
| 111 | 111 |
# GRUB Environment Block |
| 112 |
-photon_cmdline=net.ifnames=0 init=/lib/systemd/systemd ro loglevel=3 quiet plymouth.enable=0 |
|
| 112 |
+photon_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet plymouth.enable=0 |
|
| 113 | 113 |
photon_linux=vmlinuz-%{version}
|
| 114 | 114 |
photon_initrd=initrd.img-no-kmods |
| 115 | 115 |
EOF |
| ... | ... |
@@ -178,6 +178,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
| 178 | 178 |
/lib/modules/%{version}/kernel/arch/x86/oprofile/
|
| 179 | 179 |
|
| 180 | 180 |
%changelog |
| 181 |
+* Tue Apr 12 2016 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-25 |
|
| 182 |
+- Revert network interface renaming disable in kernel. |
|
| 181 | 183 |
* Tue Mar 29 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-24 |
| 182 | 184 |
- Support kmsg dumping to vmware.log on panic |
| 183 | 185 |
- sunrpc: xs_bind uses ip_local_reserved_ports |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 15%{?dist}
|
|
| 4 |
+Release: 16%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
| 6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -103,6 +103,7 @@ for tool in runlevel reboot shutdown poweroff halt telinit; do |
| 103 | 103 |
done |
| 104 | 104 |
ln -sfv ../lib/systemd/systemd %{buildroot}/sbin/init
|
| 105 | 105 |
sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legacy.conf
|
| 106 |
+sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/lib/systemd/network/99-default.link
|
|
| 106 | 107 |
rm -f %{buildroot}%{_var}/log/README
|
| 107 | 108 |
mkdir -p %{buildroot}%{_localstatedir}/log/journal
|
| 108 | 109 |
|
| ... | ... |
@@ -132,6 +133,8 @@ rm -rf %{buildroot}/*
|
| 132 | 132 |
%dir %{_localstatedir}/log/journal
|
| 133 | 133 |
|
| 134 | 134 |
%changelog |
| 135 |
+* Tue Apr 12 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-16 |
|
| 136 |
+- Disable network interface renaming. |
|
| 135 | 137 |
* Wed Mar 31 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-15 |
| 136 | 138 |
- Patch to query DHCP DUID, IAID. |
| 137 | 139 |
* Wed Mar 30 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-14 |