diff --git a/directory.list b/directory.list index cfc4840..9dabdf1 100644 --- a/directory.list +++ b/directory.list @@ -60,7 +60,6 @@ 0755 root root /lib/lsb 0755 root root /lib/modules 0755 root root /lib/firmware -0755 root root /media 0755 root root /mnt 0755 root root /opt 0555 root root /proc @@ -74,7 +73,7 @@ 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 +169,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 diff --git a/filesystem.changes b/filesystem.changes index 5a9816c..25f792a 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Wed Sep 3 16:04:23 CEST 2014 - ro@suse.de + +- drop /media directory (bnc#890198) + +------------------------------------------------------------------- +Fri Aug 29 07:10:41 UTC 2014 - lnussel@suse.de + +- make /run/lock %ghost to fix build failure + +------------------------------------------------------------------- +Wed Apr 23 18:44:15 CEST 2014 - ro@suse.de + +- make /var/run and /var/lock just ghost entries and create them + if they do not exist at all and rely on dracut hooks to + actually replace directories with symlinks there (bnc#874748) + +------------------------------------------------------------------- +Tue Apr 22 00:17:18 CEST 2014 - ro@suse.de + +- add vscan user to ignore home list + +------------------------------------------------------------------- +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 diff --git a/filesystem.links b/filesystem.links index 9e40c7f..7ef97eb 100644 --- a/filesystem.links +++ b/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 + diff --git a/filesystem.spec b/filesystem.spec index 12e1aac..d7fb4d0 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -23,9 +23,10 @@ Group: System/Fhs Version: %(echo %suse_version | cut -b-2).%(echo %suse_version | cut -b3) Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: aaa_dir -Provides: aaa_dir -Source: directory.list +Obsoletes: aaa_dir < %version-%release +Provides: aaa_dir = %version-%release +Url: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem +Source0: directory.list Source1: filesystem.links Source2: languages Source3: ghost.list @@ -40,6 +41,8 @@ the home directories of system users. %prep %setup -c -n filesystem -T +%build + %install function create_dir () { local MODE=$1 @@ -125,7 +128,10 @@ case $SRC in ;; esac ln -sf $SRC $RPM_BUILD_ROOT$DEST - echo "$DEST" >> filesystem.list + case $DEST in + /var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;; + *) echo "$DEST" >> filesystem.list ;; + esac ;; esac done < %{SOURCE1} @@ -152,6 +158,7 @@ IFS=":" while read LOGIN PASSWD UID_T GID_T NAME HOME_DIR SHELL_T ; do test "$LOGIN" = "abuild" && continue test "$LOGIN" = "icecream" && continue + test "$LOGIN" = "vscan" && continue test -n "$HOME_DIR" || continue test "$UID_T" -gt 100 && continue test -d $RPM_BUILD_ROOT/$HOME_DIR && continue @@ -189,9 +196,15 @@ test -n "$NON_EXISTING_DIR" && { exit 1 } -%pre -p +%pretrans -p os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") +if not posix.stat("/var/run") then + posix.symlink("/run","/var/run") +end +if not posix.stat("/var/lock") then + posix.symlink("/run/lock","/var/lock") +end %files -f filesystem.list diff --git a/ghost.list b/ghost.list index 4e2d602..e0c38c1 100644 --- a/ghost.list +++ b/ghost.list @@ -1,2 +1,3 @@ 1777 root root /tmp/.X11-unix 1777 root root /tmp/.ICE-unix +0775 root lock /run/lock