SPECS/filesystem.spec

@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 3.8
-Release: 6%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 URL: https://pagure.io/filesystem
 Group: System Environment/Base
@@ -43,8 +43,8 @@ cd %{buildroot}
 mkdir -p boot dev \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d} \
         home media mnt opt proc root run srv sys tmp \
-        usr/{bin,games,include,%{_lib}/{bpf,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,sse2},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \
-        var/{adm,empty,ftp,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp}
+        usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \
+        var/{adm,empty,ftp,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 #do not create the symlink atm.
 #ln -snf etc/sysconfig etc/default
@@ -153,19 +153,6 @@ posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz")
 posix.symlink("usr/sbin", "/usr/lib/debug/sbin")
 posix.symlink("usr/%{_lib}", "/%{_lib}")
 posix.mkdir("/run")
-posix.mkdir("/proc")
-posix.mkdir("/sys")
-
-st = posix.stat("/proc")
-if st and st.mode ~= 0555 then
-  posix.chmod("/proc", 0555)
-end
-
-st = posix.stat("/sys")
-if st and st.mode ~= 0555 then
-  posix.chmod("/sys", 0555)
-end
-
 st = posix.stat("/media")
 if st and st.type == "link" then
   os.remove("/media")
@@ -215,12 +202,12 @@ restorecon /media 2>/dev/null >/dev/null || :
 /media
 %dir /mnt
 %dir /opt
-%ghost %attr(555,root,root) /proc
-%ghost %attr(555,root,root) /sys
+%attr(555,root,root) /proc
 %attr(550,root,root) /root
 /run
 /sbin
 /srv
+%attr(555,root,root) /sys
 %attr(1777,root,root) /tmp
 %dir /usr
 %attr(555,root,root) /usr/bin
@@ -249,7 +236,6 @@ restorecon /media 2>/dev/null >/dev/null || :
 %else
 %attr(555,root,root) /usr/lib/tls
 %attr(555,root,root) /usr/lib/X11
-%attr(555,root,root) /usr/lib/bpf
 %attr(555,root,root) /usr/lib/pm-utils
 %endif
 /usr/libexec
@@ -291,8 +277,7 @@ restorecon /media 2>/dev/null >/dev/null || :
 /usr/tmp
 %dir /var
 /var/adm
-%dir /var/cache
-/var/cache/bpf
+/var/cache
 /var/db
 /var/empty
 /var/ftp
@@ -314,16 +299,6 @@ restorecon /media 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
-* Mon Jun 21 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.8-6
-- Make /proc and /sys ghost to workaround issue in container
-- Revert restorecon change
-
-* Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.8-4
-- Do not restore content of /proc (#1827087)
-
-* Wed Apr 22 2020 Pavel Zhukov <pavel@desktop.zhukoff.net> - 3.8-3
-- Add BPF directories (#1788999)
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild