Browse code

ghost /mnt/cdrom in filesystem

Change-Id: Ie95ea28cca716afe1e8cf66284cb41e7f469bb99
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4081
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Priyesh Padmavilasomb authored on 2017/10/20 06:26:54
Showing 3 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Default file system
2 2
 Name:		filesystem
3 3
 Version:	1.1
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	GPLv3
6 6
 Group:		System Environment/Base
7 7
 Vendor:		VMware, Inc.
... ...
@@ -513,7 +513,7 @@ EOF
513 513
 #	run filesystem
514 514
 %dir /run/lock
515 515
 #	usr filesystem
516
-%dir /mnt/cdrom
516
+%ghost /mnt/cdrom
517 517
 %dir /mnt/hgfs
518 518
 %dir /usr/bin
519 519
 %dir /usr/include
... ...
@@ -589,6 +589,8 @@ EOF
589 589
 /usr/local/lib64
590 590
 %endif
591 591
 %changelog
592
+*   Thu Oct 19 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  1.1-2
593
+-   ghost /mnt/cdrom
592 594
 *   Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com>  1.1-1
593 595
 -   Move network file from filesystem package
594 596
 *   Tue Mar 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0-10
595 597
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+d /mnt/cdrom 0755 - - - -
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:          Systemd-228
2 2
 Name:             systemd
3 3
 Version:          228
4
-Release:          38%{?dist}
4
+Release:          39%{?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
... ...
@@ -11,6 +11,7 @@ Source0:          %{name}-%{version}.tar.gz
11 11
 %define sha1 systemd=15475d874dc38f8d759f334bbcf7d8aff4b412da
12 12
 Source1:          99-vmware-hotplug.rules
13 13
 Source2:          50-security-hardening.conf
14
+Source3:          filesystem.conf
14 15
 #patch for ostree
15 16
 Patch0:           systemd-228-mount.patch
16 17
 Patch1:           01-enoX-uses-instance-number-for-vmware-hv.patch
... ...
@@ -159,6 +160,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/journal
159 159
 find %{buildroot}%{_libdir} -name '*.la' -delete
160 160
 install -Dm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d
161 161
 install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysctl.d
162
+install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/tmpfiles.d/
162 163
 rm %{buildroot}/lib/systemd/system/default.target
163 164
 ln -sfv multi-user.target %{buildroot}/lib/systemd/system/default.target
164 165
 install -vdm 755 %{buildroot}/%{_sysconfdir}/systemd/network
... ...
@@ -235,6 +237,8 @@ rm -rf %{buildroot}/*
235 235
 
236 236
 
237 237
 %changelog
238
+*    Thu Oct 19 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 228-39
239
+-    add filesystem.conf in tmpfiles.d
238 240
 *    Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com>  228-38
239 241
 -    Move network file to systemd package
240 242
 *    Thu Sep 07 2017 Vinay Kulkarni <kulkarniv@vmware.com>  228-37