rpms/filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "ship /var/run and /var/lock as symlinks in payload, don't handle them as part of post scriptlet (#919374)"

Browse Source 
This reverts commit 472aeb5764.
This commit is contained in:
Ondřej Vašík 2013-03-18 14:03:21 +01:00
parent 472aeb5764
commit 1fe98b37e7
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
filesystem.spec
View File

@ -1,7 +1,7 @@
Summary: The basic directory layout for a Linux system Summary: The basic directory layout for a Linux system
Name: filesystem Name: filesystem
Version: 3.2 Version: 3.2
Release: 8%{?dist} Release: 7%{?dist}
License: Public Domain License: Public Domain
URL: https://fedorahosted.org/filesystem URL: https://fedorahosted.org/filesystem
Group: System Environment/Base Group: System Environment/Base
@ -39,7 +39,7 @@ 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} \ 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/lock srv sys tmp \ home media mnt opt proc root run/lock srv sys tmp \
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug,games,locale,modules,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,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \ usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug,games,locale,modules,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,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \
var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp} var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
#do not create the symlink atm. #do not create the symlink atm.
#ln -snf etc/sysconfig etc/default #ln -snf etc/sysconfig etc/default
@ -53,10 +53,6 @@ ln -snf usr/%{_lib} lib
ln -snf usr/lib lib ln -snf usr/lib lib
%endif %endif
ln -snf usr/%{_lib} %{_lib} ln -snf usr/%{_lib} %{_lib}
ln -snf ../run var/run
ln -snf ../run/lock var/lock
mkdir var/lock/subsys
sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \ sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
>%{buildroot}/iso_639.tab >%{buildroot}/iso_639.tab
@ -139,6 +135,10 @@ end
return 0 return 0
%post -p <lua>
posix.symlink("../run", "/var/run")
posix.symlink("../run/lock", "/var/lock")
%files -f filelist %files -f filelist
%defattr(0755,root,root,-) %defattr(0755,root,root,-)
%dir %attr(555,root,root) / %dir %attr(555,root,root) /
@ -225,14 +225,14 @@ return 0
/var/gopher /var/gopher
/var/lib /var/lib
/var/local /var/local
%dir %attr(755,root,root) /var/lock %ghost %dir %attr(755,root,root) /var/lock
%ghost /var/lock/subsys %ghost /var/lock/subsys
/var/log /var/log
/var/mail /var/mail
/var/nis /var/nis
/var/opt /var/opt
/var/preserve /var/preserve
%attr(755,root,root) /var/run %ghost %attr(755,root,root) /var/run
%dir /var/spool %dir /var/spool
%attr(755,root,root) /var/spool/lpd %attr(755,root,root) /var/spool/lpd
%attr(775,root,mail) /var/spool/mail %attr(775,root,mail) /var/spool/mail
@ -241,10 +241,6 @@ return 0
/var/yp /var/yp
%changelog %changelog
* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-8
- ship /var/run and /var/lock as symlinks in payload,
don't handle them as part of post scriptlet (#919374)
* Tue Mar 05 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-7 * Tue Mar 05 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-7
- add support for AArch64 architecture (#917804) - add support for AArch64 architecture (#917804)