From 889539e943e6f5dfd0cc8a61e242435d810ea08e0a8ab18f62e69068392b3873 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Mar 2014 08:58:35 +0000 Subject: [PATCH 1/4] 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 --- directory.list | 2 -- filesystem.changes | 13 +++++++++++++ filesystem.links | 2 ++ filesystem.spec | 13 +++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/directory.list b/directory.list index cfc4840..f19d57e 100644 --- a/directory.list +++ b/directory.list @@ -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 diff --git a/filesystem.changes b/filesystem.changes index 5a9816c..37a7345 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -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 diff --git a/filesystem.links b/filesystem.links index 9e40c7f..264c0c4 100644 --- a/filesystem.links +++ b/filesystem.links @@ -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 diff --git a/filesystem.spec b/filesystem.spec index 12e1aac..8112ac2 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -192,6 +192,19 @@ test -n "$NON_EXISTING_DIR" && { %pre -p 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 From 2ca7667fab198d71966d637ad3b3c3cf876f4ebbda2bdd0ae77dd5e6695249c5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 3 Mar 2014 12:30:22 +0000 Subject: [PATCH 2/4] Accepting request 224408 from home:oertel:branches:Base:System - change pre to pretrans for directory/symlink conversion OBS-URL: https://build.opensuse.org/request/show/224408 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=121 --- filesystem.changes | 5 +++++ filesystem.spec | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/filesystem.changes b/filesystem.changes index 37a7345..3beed28 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/filesystem.spec b/filesystem.spec index 8112ac2..228e9f1 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -189,7 +189,7 @@ test -n "$NON_EXISTING_DIR" && { exit 1 } -%pre -p +%pretrans -p os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") st = posix.stat("/var/run") @@ -197,13 +197,10 @@ 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 + os.rename("/var/run","/var/run.old") + posix.symlink("/run","/var/run") + os.execute("rm -rf /var/run.old") end %files -f filesystem.list From 286df5c888d77f22f2f581573b5e1b220a04afb35c890851ff5084d1393f30d9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 10 Mar 2014 16:59:35 +0000 Subject: [PATCH 3/4] Accepting request 224999 from home:oertel:branches:Base:System - use lazy umount - use os.execute("umount ...") instead of posix.umount("...") bnc#866964 OBS-URL: https://build.opensuse.org/request/show/224999 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=122 --- filesystem.changes | 11 +++++++++++ filesystem.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/filesystem.changes b/filesystem.changes index 3beed28..3a03693 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/filesystem.spec b/filesystem.spec index 228e9f1..427cc97 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -196,7 +196,7 @@ 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("umount -l /var/run") end os.rename("/var/run","/var/run.old") posix.symlink("/run","/var/run") From f23065b2e00c05ea1d7712c255873d4799bf0cf1d57c96906b7f18d3df3f1ea9 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 11 Apr 2014 12:13:18 +0000 Subject: [PATCH 4/4] - 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