Browse code
Move network file from filesystem to systemd package
Change-Id: Idbc6fccabf3255ab4677fe711149680292104294
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3787
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
suezzelur authored on 2017/09/16 10:12:09Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Default file system |
| 2 | 2 |
Name: filesystem |
| 3 |
-Version: 1.0 |
|
| 4 |
-Release: 10%{?dist}
|
|
| 3 |
+Version: 1.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPLv3 |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -26,7 +26,6 @@ install -vdm 755 %{buildroot}/etc
|
| 26 | 26 |
install -vdm 755 %{buildroot}/etc/opt
|
| 27 | 27 |
install -vdm 755 %{buildroot}/etc/profile.d
|
| 28 | 28 |
install -vdm 755 %{buildroot}/etc/sysconfig
|
| 29 |
-install -vdm 755 %{buildroot}/etc/systemd/network
|
|
| 30 | 29 |
install -vdm 755 %{buildroot}/home
|
| 31 | 30 |
install -vdm 755 %{buildroot}/mnt
|
| 32 | 31 |
install -vdm 755 %{buildroot}/mnt/cdrom
|
| ... | ... |
@@ -178,16 +177,7 @@ users:x:100: |
| 178 | 178 |
sudo:x:27: |
| 179 | 179 |
wheel:x:28: |
| 180 | 180 |
EOF |
| 181 |
-# |
|
| 182 |
-# 7.2.2. Creating Network Interface Configuration Files" |
|
| 183 |
-# |
|
| 184 |
-cat > %{buildroot}/etc/systemd/network/99-dhcp-en.network <<- "EOF"
|
|
| 185 |
-[Match] |
|
| 186 |
-Name=e* |
|
| 187 | 181 |
|
| 188 |
-[Network] |
|
| 189 |
-DHCP=yes |
|
| 190 |
-EOF |
|
| 191 | 182 |
# |
| 192 | 183 |
# Creating Proxy Configuration" |
| 193 | 184 |
# |
| ... | ... |
@@ -515,8 +505,6 @@ EOF |
| 515 | 515 |
%config(noreplace) /etc/sysconfig/clock |
| 516 | 516 |
%config(noreplace) /etc/sysconfig/console |
| 517 | 517 |
%config(noreplace) /etc/sysconfig/proxy |
| 518 |
-%dir /etc/systemd/network |
|
| 519 |
-%config(noreplace) /etc/systemd/network/99-dhcp-en.network |
|
| 520 | 518 |
%dir /etc/profile.d |
| 521 | 519 |
%config(noreplace) /etc/profile.d/proxy.sh |
| 522 | 520 |
# media filesystem |
| ... | ... |
@@ -601,6 +589,8 @@ EOF |
| 601 | 601 |
/usr/local/lib64 |
| 602 | 602 |
%endif |
| 603 | 603 |
%changelog |
| 604 |
+* Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com> 1.1-1 |
|
| 605 |
+- Move network file from filesystem package |
|
| 604 | 606 |
* Tue Mar 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0-10 |
| 605 | 607 |
- Create default DHCP net config in 99-dhcp-en.network instead of 10-dhcp-en.network |
| 606 | 608 |
* Mon Jan 9 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0-9 |
| ... | ... |
@@ -609,8 +599,8 @@ EOF |
| 609 | 609 |
- Removing multiple entries of localhost in /etc/hosts file |
| 610 | 610 |
* Fri May 27 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-7 |
| 611 | 611 |
- Fixed nobody user uid and group gid |
| 612 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0-6 |
|
| 613 |
-- GA - Bump release of all rpms |
|
| 612 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0-6 |
|
| 613 |
+- GA - Bump release of all rpms |
|
| 614 | 614 |
* Wed May 4 2016 Divya Thaluru <dthaluru@vmware.com> 1.0-5 |
| 615 | 615 |
- Removing non-existent users from /etc/group file |
| 616 | 616 |
* Fri Apr 29 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 1.0-4 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 37%{?dist}
|
|
| 4 |
+Release: 38%{?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 |
| ... | ... |
@@ -43,6 +43,7 @@ Requires: libcap |
| 43 | 43 |
Requires: xz |
| 44 | 44 |
Requires: kmod |
| 45 | 45 |
Requires: glib |
| 46 |
+Requires: filesystem >= 1.1 |
|
| 46 | 47 |
BuildRequires: intltool |
| 47 | 48 |
BuildRequires: gperf |
| 48 | 49 |
BuildRequires: libcap-devel |
| ... | ... |
@@ -160,6 +161,17 @@ install -Dm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d
|
| 160 | 160 |
install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysctl.d
|
| 161 | 161 |
rm %{buildroot}/lib/systemd/system/default.target
|
| 162 | 162 |
ln -sfv multi-user.target %{buildroot}/lib/systemd/system/default.target
|
| 163 |
+install -vdm 755 %{buildroot}/%{_sysconfdir}/systemd/network
|
|
| 164 |
+# |
|
| 165 |
+# 7.2.2. Creating Network Interface Configuration Files" |
|
| 166 |
+# |
|
| 167 |
+cat > %{buildroot}/%{_sysconfdir}/systemd/network/99-dhcp-en.network <<- "EOF"
|
|
| 168 |
+[Match] |
|
| 169 |
+Name=e* |
|
| 170 |
+ |
|
| 171 |
+[Network] |
|
| 172 |
+DHCP=yes |
|
| 173 |
+EOF |
|
| 163 | 174 |
|
| 164 | 175 |
%post |
| 165 | 176 |
/sbin/ldconfig |
| ... | ... |
@@ -198,7 +210,8 @@ rm -rf %{buildroot}/*
|
| 198 | 198 |
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
|
| 199 | 199 |
%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf
|
| 200 | 200 |
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user
|
| 201 |
- |
|
| 201 |
+%dir %{_sysconfdir}/systemd/network
|
|
| 202 |
+%config(noreplace) %{_sysconfdir}/systemd/network/99-dhcp-en.network
|
|
| 202 | 203 |
%dir %{_sysconfdir}/udev
|
| 203 | 204 |
%dir %{_sysconfdir}/udev/rules.d
|
| 204 | 205 |
%dir %{_sysconfdir}/udev/hwdb.d
|
| ... | ... |
@@ -222,6 +235,8 @@ rm -rf %{buildroot}/*
|
| 222 | 222 |
|
| 223 | 223 |
|
| 224 | 224 |
%changelog |
| 225 |
+* Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com> 228-38 |
|
| 226 |
+- Move network file to systemd package |
|
| 225 | 227 |
* Thu Sep 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 228-37 |
| 226 | 228 |
- Fix systemd-logind dbus disconnection issue. |
| 227 | 229 |
* Fri Jul 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 228-36 |