From f23065b2e00c05ea1d7712c255873d4799bf0cf1d57c96906b7f18d3df3f1ea9 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 11 Apr 2014 12:13:18 +0000 Subject: [PATCH] - change /sys to mode 0555 (bnc#871640) - make /var/lock a symlink to /run/lock (bnc#867873) OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=123 --- directory.list | 4 ++-- filesystem.changes | 10 ++++++++++ filesystem.links | 5 ++++- filesystem.spec | 7 +++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/directory.list b/directory.list index f19d57e..4fa98a1 100644 --- a/directory.list +++ b/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 @@ -171,7 +172,6 @@ 0755 root root /var/lib/misc 0755 nobody root /var/lib/nobody 0755 wwwrun root /var/lib/wwwrun -1775 root lock /var/lock 0755 root root /var/spool 0755 lp lp /var/spool/lpd 0770 mail mail /var/spool/clientmqueue diff --git a/filesystem.changes b/filesystem.changes index 3a03693..06018df 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/filesystem.links b/filesystem.links index 264c0c4..7ef97eb 100644 --- a/filesystem.links +++ b/filesystem.links @@ -1,9 +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 + diff --git a/filesystem.spec b/filesystem.spec index 427cc97..2d35a54 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -202,6 +202,13 @@ if st and st.type == "directory" then 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