forked from pool/filesystem
Accepting request 224224 from home:oertel:branches:Base:System
- drop /var/lib/pam_devperm (bnc#866234) - replace /var/run by symlink to /run - try to handle case where /var/run is a bind-mount - extend lua script in preinstall to handle this transition - bnc#865893 OBS-URL: https://build.opensuse.org/request/show/224224 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=120
This commit is contained in:
parent
91290fbc05
commit
889539e943
@ -170,10 +170,8 @@
|
||||
0755 root root /var/games
|
||||
0755 root root /var/lib/misc
|
||||
0755 nobody root /var/lib/nobody
|
||||
0700 root root /var/lib/pam_devperm
|
||||
0755 wwwrun root /var/lib/wwwrun
|
||||
1775 root lock /var/lock
|
||||
0755 root root /var/run
|
||||
0755 root root /var/spool
|
||||
0755 lp lp /var/spool/lpd
|
||||
0770 mail mail /var/spool/clientmqueue
|
||||
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 13:56:47 CET 2014 - ro@suse.de
|
||||
|
||||
- drop /var/lib/pam_devperm (bnc#866234)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 27 18:48:24 CET 2014 - ro@suse.de
|
||||
|
||||
- replace /var/run by symlink to /run
|
||||
- try to handle case where /var/run is a bind-mount
|
||||
- extend lua script in preinstall to handle this transition
|
||||
- bnc#865893
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 6 12:53:48 UTC 2014 - dmueller@suse.com
|
||||
|
||||
|
@ -4,4 +4,6 @@ init.d /etc/rc.d
|
||||
../lock /var/spool/locks
|
||||
# Required for FHS 2.1
|
||||
spool/mail /var/mail
|
||||
# systemd
|
||||
../run /var/run
|
||||
|
||||
|
@ -192,6 +192,19 @@ test -n "$NON_EXISTING_DIR" && {
|
||||
%pre -p <lua>
|
||||
os.remove ("/usr/include/X11")
|
||||
os.remove ("/usr/lib/X11")
|
||||
st = posix.stat("/var/run")
|
||||
if st and st.type == "directory" then
|
||||
sta = posix.stat("/var/run/systemd")
|
||||
if sta and sta.type == "directory" then
|
||||
posix.umount("/var/run")
|
||||
os.execute("rm -rf /var/run")
|
||||
posix.symlink("/run","/var/run")
|
||||
else
|
||||
os.rename("/var/run","/var/run.old")
|
||||
posix.symlink("/run","/var/run")
|
||||
os.execute("cp -a /var/run.old/* /run")
|
||||
end
|
||||
end
|
||||
|
||||
%files -f filesystem.list
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user