Merge #51 `Add desktop discussion link to README.md, sync some changes from FAH`

This commit is contained in:
Dennis Gilmore 2018-01-18 18:56:01 +00:00
commit 23ffcb49ef
3 changed files with 23 additions and 6 deletions

View File

@ -20,6 +20,8 @@ This project is actively maintained and is ready for use
by sophisticated and interested users, but not ready by sophisticated and interested users, but not ready
for widespread promotion. for widespread promotion.
See some [https://lists.fedoraproject.org/archives/list/desktop@lists.fedoraproject.org/thread/J6BJS7Z4NKNOQUZWGYXZZIEKYMWBBSUY/](discussion about the first release).
Installing Installing
------------ ------------

View File

@ -9,7 +9,7 @@
"automatic_version_prefix": "28", "automatic_version_prefix": "28",
"initramfs-args": ["--no-hostonly"], "boot_location": "new",
"etc-group-members": ["wheel"], "etc-group-members": ["wheel"],

25
post.sh
View File

@ -1,8 +1,23 @@
#!/bin/bash #!/usr/bin/env bash
# This file is very similar to treecompose-post.sh
# from fedora-atomic: https://pagure.io/fedora-atomic
# Make changes there first where applicable.
set -xeuo pipefail set -xeuo pipefail
# See https://bugzilla.redhat.com/show_bug.cgi?id=1265295 ; some # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
# aspects of that have been fixed, but apparently this is still # Also note the create-new-then-rename dance for rofiles-fuse compat
# necessary, and generally makes things less finicky if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
echo 'Storage=persistent' >> /etc/systemd/journald.conf (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
mv /etc/systemd.journald.conf{.new,}
fi
# See: https://src.fedoraproject.org/rpms/glibc/pull-request/4
# Basically that program handles deleting old shared library directories
# mid-transaction, which never applies to rpm-ostree. This is structured as a
# loop/glob to avoid hardcoding (or trying to match) the architecture.
for x in /usr/sbin/glibc_post_upgrade.*; do
if test -f ${x}; then
ln -srf /usr/bin/true ${x}
fi
done