Accepting request 229996 from Base:System

Fixed permissions of /sys and update /var/lock

OBS-URL: https://build.opensuse.org/request/show/229996
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem?expand=0&rev=120

directory.list

@@ -68,13 +68,14 @@
 0700 root root /root/.gnupg
 0755 root root /root/bin
 0755 root root /run
+0775 root lock /run/lock
 0755 root root /sbin
 0755 root root /selinux
 0755 root root /srv/ftp
 0755 root root /srv/www
 0755 root root /srv/www/cgi-bin
 0755 root root /srv/www/htdocs
-0755 root root /sys
+0555 root root /sys
 1777 root root /tmp
 0755 root root /usr
 0755 root root /usr/bin
@@ -170,10 +171,7 @@
 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

filesystem.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Fri Apr 11 14:02:07 CEST 2014 - ro@suse.de
+
+- change /sys to mode 0555 (bnc#871640) 
+
+-------------------------------------------------------------------
+Wed Mar 12 10:19:17 CET 2014 - ro@suse.de
+
+- make /var/lock a symlink to /run/lock (bnc#867873) 
+
+-------------------------------------------------------------------
+Fri Mar  7 11:11:05 CET 2014 - ro@suse.de
+
+- use lazy umount 
+
+-------------------------------------------------------------------
+Thu Mar  6 01:03:53 CET 2014 - ro@suse.de
+
+- use os.execute("umount ...") instead of posix.umount("...")
+  bnc#866964 
+
+-------------------------------------------------------------------
+Mon Mar  3 11:48:31 CET 2014 - ro@suse.de
+
+- change pre to pretrans for directory/symlink conversion 
+
+-------------------------------------------------------------------
+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
 

filesystem.links

@@ -1,7 +1,12 @@
 # links to be created
 init.d			/etc/rc.d
 ../var/tmp		/usr/tmp
-../lock			/var/spool/locks
 # Required for FHS 2.1
 spool/mail		/var/mail
+# systemd
+../run                  /var/run
+../run/lock             /var/lock
+# modify
+../../run/lock		/var/spool/locks
+
 

filesystem.spec

@@ -189,9 +189,26 @@ test -n "$NON_EXISTING_DIR" && {
     exit 1
 }
 
-%pre -p <lua>
+%pretrans -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
+    os.execute("umount -l /var/run")
+  end
+  os.rename("/var/run","/var/run.old")
+  posix.symlink("/run","/var/run")
+  os.execute("rm -rf /var/run.old")
+end
+st = posix.stat("/var/lock")
+if st and st.type == "directory" then
+  os.execute("umount -l /var/lock")
+  os.rename("/var/lock","/var/lock.old")
+  posix.symlink("/run/lock","/var/lock")
+  os.execute("rm -rf /var/lock.old")
+end
 
 %files -f filesystem.list