Browse code
Move network file from filesystem to systemd package
Change-Id: I07e79e644f2f7e5921aa601818419cd281d269e8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3788
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
suezzelur authored on 2017/09/16 10:24:06Showing 3 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Default file system |
| 2 | 2 |
Name: filesystem |
| 3 |
-Version: 1.0 |
|
| 4 |
-Release: 13%{?dist}
|
|
| 3 |
+Version: 1.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPLv3 |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -21,7 +21,6 @@ for the directories. This version is for a system configured with systemd. |
| 21 | 21 |
# |
| 22 | 22 |
install -vdm 755 %{buildroot}/{dev,proc,run/{media/{floppy,cdrom},lock},sys}
|
| 23 | 23 |
install -vdm 755 %{buildroot}/{boot,etc/{opt,sysconfig},home,mnt}
|
| 24 |
-install -vdm 755 %{buildroot}/etc/systemd/network
|
|
| 25 | 24 |
install -vdm 755 %{buildroot}/{var}
|
| 26 | 25 |
install -dv -m 0750 %{buildroot}/root
|
| 27 | 26 |
install -dv -m 1777 %{buildroot}/tmp %{buildroot}/var/tmp
|
| ... | ... |
@@ -121,16 +120,6 @@ sudo:x:27: |
| 121 | 121 |
wheel:x:28: |
| 122 | 122 |
EOF |
| 123 | 123 |
# |
| 124 |
-# 7.2.2. Creating Network Interface Configuration Files" |
|
| 125 |
-# |
|
| 126 |
-cat > %{buildroot}/etc/systemd/network/99-dhcp-en.network <<- "EOF"
|
|
| 127 |
-[Match] |
|
| 128 |
-Name=e* |
|
| 129 |
- |
|
| 130 |
-[Network] |
|
| 131 |
-DHCP=yes |
|
| 132 |
-EOF |
|
| 133 |
-# |
|
| 134 | 124 |
# Creating Proxy Configuration" |
| 135 | 125 |
# |
| 136 | 126 |
cat > %{buildroot}/etc/sysconfig/proxy <<- "EOF"
|
| ... | ... |
@@ -459,8 +448,6 @@ EOF |
| 459 | 459 |
%config(noreplace) /etc/sysconfig/clock |
| 460 | 460 |
%config(noreplace) /etc/sysconfig/console |
| 461 | 461 |
%config(noreplace) /etc/sysconfig/proxy |
| 462 |
-%dir /etc/systemd/network |
|
| 463 |
-%config(noreplace) /etc/systemd/network/99-dhcp-en.network |
|
| 464 | 462 |
%dir /etc/profile.d |
| 465 | 463 |
%config(noreplace) /etc/profile.d/proxy.sh |
| 466 | 464 |
# media filesystem |
| ... | ... |
@@ -554,6 +541,8 @@ EOF |
| 554 | 554 |
/usr/lib/debug/usr/lib64 |
| 555 | 555 |
%endif |
| 556 | 556 |
%changelog |
| 557 |
+* Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com> 1.1-1 |
|
| 558 |
+- Move network file from filesystem package |
|
| 557 | 559 |
* Fri Apr 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0-13 |
| 558 | 560 |
- make /var/run symlink to /run and keep it in rpm |
| 559 | 561 |
* Thu Apr 20 2017 Bo Gan <ganb@vmware.com> 1.0-12 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-233 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 233 |
| 4 |
-Release: 7%{?dist}
|
|
| 4 |
+Release: 8%{?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 |
| ... | ... |
@@ -12,6 +12,7 @@ Source0: %{name}-%{version}.tar.gz
|
| 12 | 12 |
Source1: 99-vmware-hotplug.rules |
| 13 | 13 |
Source2: 50-security-hardening.conf |
| 14 | 14 |
Source3: systemd.cfg |
| 15 |
+Source4: 99-dhcp-en.network |
|
| 15 | 16 |
|
| 16 | 17 |
Patch0: 01-enoX-uses-instance-number-for-vmware-hv.patch |
| 17 | 18 |
Patch1: 02-install-general-aliases.patch |
| ... | ... |
@@ -30,6 +31,7 @@ Requires: libcap |
| 30 | 30 |
Requires: xz |
| 31 | 31 |
Requires: kmod |
| 32 | 32 |
Requires: glib |
| 33 |
+Requires: filesystem >= 1.1 |
|
| 33 | 34 |
BuildRequires: intltool |
| 34 | 35 |
BuildRequires: gperf |
| 35 | 36 |
BuildRequires: libcap-devel |
| ... | ... |
@@ -130,8 +132,6 @@ sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf
|
| 130 | 130 |
rm -f %{buildroot}%{_var}/log/README
|
| 131 | 131 |
mkdir -p %{buildroot}%{_localstatedir}/log/journal
|
| 132 | 132 |
|
| 133 |
-#cp %{buildroot}/usr/share/factory/etc/pam.d/system-auth %{buildroot}%{_sysconfdir}/pam.d/system-auth
|
|
| 134 |
-#cp %{buildroot}/usr/share/factory/etc/pam.d/other %{buildroot}%{_sysconfdir}/pam.d/other
|
|
| 135 | 133 |
find %{buildroot} -name '*.la' -delete
|
| 136 | 134 |
install -Dm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d
|
| 137 | 135 |
install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysctl.d
|
| ... | ... |
@@ -139,6 +139,8 @@ install -dm 0755 %{buildroot}/boot/
|
| 139 | 139 |
install -m 0644 %{SOURCE3} %{buildroot}/boot/
|
| 140 | 140 |
rm %{buildroot}/lib/systemd/system/default.target
|
| 141 | 141 |
ln -sfv multi-user.target %{buildroot}/lib/systemd/system/default.target
|
| 142 |
+install -dm 0755 %{buildroot}/%{_sysconfdir}/systemd/network
|
|
| 143 |
+install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/systemd/network
|
|
| 142 | 144 |
%find_lang %{name}
|
| 143 | 145 |
|
| 144 | 146 |
%post |
| ... | ... |
@@ -177,6 +179,7 @@ rm -rf %{buildroot}/*
|
| 177 | 177 |
%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
|
| 178 | 178 |
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
|
| 179 | 179 |
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user
|
| 180 |
+%config(noreplace) %{_sysconfdir}/systemd/network/99-dhcp-en.network
|
|
| 180 | 181 |
|
| 181 | 182 |
%dir %{_sysconfdir}/udev
|
| 182 | 183 |
%dir %{_sysconfdir}/udev/rules.d
|
| ... | ... |
@@ -234,6 +237,8 @@ rm -rf %{buildroot}/*
|
| 234 | 234 |
%files lang -f %{name}.lang
|
| 235 | 235 |
|
| 236 | 236 |
%changelog |
| 237 |
+* Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com> 233-8 |
|
| 238 |
+- Move network file to systemd package |
|
| 237 | 239 |
* Tue Aug 15 2017 Alexey Makhalov <amakhalov@vmware.com> 233-7 |
| 238 | 240 |
- Fix compilation issue for glibc-2.26 |
| 239 | 241 |
* Fri Jul 20 2017 Vinay Kulkarni <kulkarniv@vmware.com> 233-6 |