Accepting request 1115620 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1115620 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem?expand=0&rev=171
This commit is contained in:
commit
fd4906cfc0
@ -120,7 +120,6 @@
|
||||
0555 root root /var/lib/empty
|
||||
0755 root root /var/lib/misc
|
||||
0755 root root /var/spool
|
||||
1777 root root /var/spool/mail
|
||||
1777 root root /var/tmp
|
||||
0755 root root /var/log
|
||||
0755 root root /var/opt
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 25 08:45:52 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
|
||||
|
||||
- Add /run/lock (boo#1212926)
|
||||
- Remove /var/spool/mail (boo#1179574)
|
||||
- Remove obsolete home dir check. The filesystem package is not
|
||||
meant to contain home directories of random system users anymore
|
||||
- Create ghost symlinks also in pretrans, needed to get /var/run as
|
||||
link right away
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 12 12:19:29 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
@ -1,5 +1,4 @@
|
||||
# links to be created
|
||||
# Required for FHS 2.1
|
||||
spool/mail /var/mail
|
||||
# systemd
|
||||
../run /var/run %ghost
|
||||
../run/lock /var/lock %ghost
|
||||
|
@ -102,6 +102,20 @@ for i in pairs(ghosts) do
|
||||
mkdir_p(i)
|
||||
posix.chmod(i, ghosts[i])
|
||||
end
|
||||
|
||||
local ghost_links = {
|
||||
EOF
|
||||
# ghost symlinks
|
||||
while read SRC DEST ATTR ; do
|
||||
[ "$ATTR" = "%%ghost" ] || continue
|
||||
echo "[\"$DEST\"] = \"$SRC\","
|
||||
done < filesystem.links >> pretrans.lua
|
||||
cat >> pretrans.lua <<'EOF'
|
||||
}
|
||||
for i in pairs(ghost_links) do
|
||||
mkdir_p(i:match(".*/"))
|
||||
posix.symlink(ghost_links[i], i)
|
||||
end
|
||||
EOF
|
||||
#
|
||||
#
|
||||
@ -273,28 +287,6 @@ done < %{SOURCE4}
|
||||
|
||||
RPM_INSTALL_PREFIX=$RPM_BUILD_ROOT
|
||||
export RPM_BUILD_ROOT
|
||||
# check, if all home directories are present.
|
||||
UNFOUND=false
|
||||
UNFOUND_DIRS=
|
||||
OLDIFS="$IFS"
|
||||
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
|
||||
echo $HOME_DIR does not exist.
|
||||
UNFOUND=true
|
||||
UNFOUND_DIRS="$UNFOUND_DIRS $HOME_DIR"
|
||||
done < /etc/passwd
|
||||
IFS=$OLDIFS
|
||||
if test "$UNFOUND" = true ; then
|
||||
echo There are home directories defined, which are not present.
|
||||
echo Unfound: $UNFOUND_DIRS
|
||||
exit 1
|
||||
fi
|
||||
#
|
||||
# now check, if all files of aaa_base have a directory in this package
|
||||
#
|
||||
|
@ -7,6 +7,7 @@
|
||||
0755 root root /srv/www
|
||||
0755 root root /srv/www/cgi-bin
|
||||
0755 root root /srv/www/htdocs
|
||||
0755 root root /run/lock
|
||||
0555 root root /sys
|
||||
0755 root root /usr/local
|
||||
0755 root root /usr/local/bin
|
||||
|
Loading…
Reference in New Issue
Block a user