From 1f4c181c2b0fbadad16371b0159859cf51576520 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 1 Dec 2017 16:44:43 -0500 Subject: [PATCH 1/3] README: Link to desktop discussion --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 772ff7d..b009999 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ This project is actively maintained and is ready for use by sophisticated and interested users, but not ready for widespread promotion. +See some [https://lists.fedoraproject.org/archives/list/desktop@lists.fedoraproject.org/thread/J6BJS7Z4NKNOQUZWGYXZZIEKYMWBBSUY/](discussion about the first release). + Installing ------------ From 78daa8217db40e524b5abf4b8d7405bb7cc4aef4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 9 Jan 2018 16:32:12 -0500 Subject: [PATCH 2/3] manifest: Use boot_location: new Matches https://pagure.io/fedora-atomic/pull-request/102 --- fedora-ostree-workstation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json index ee25f3b..9c81026 100644 --- a/fedora-ostree-workstation.json +++ b/fedora-ostree-workstation.json @@ -9,7 +9,7 @@ "automatic_version_prefix": "28", - "initramfs-args": ["--no-hostonly"], + "boot_location": "new", "etc-group-members": ["wheel"], From c3ce622191372cd0372fec9dc3746e1c87dc8a17 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 9 Jan 2018 16:33:30 -0500 Subject: [PATCH 3/3] post.sh: Sync with fedora-atomic - journald.conf change tweak - glibc_post_upgrade removal --- post.sh | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/post.sh b/post.sh index d139161..77c5977 100755 --- a/post.sh +++ b/post.sh @@ -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 -# See https://bugzilla.redhat.com/show_bug.cgi?id=1265295 ; some -# aspects of that have been fixed, but apparently this is still -# necessary, and generally makes things less finicky -echo 'Storage=persistent' >> /etc/systemd/journald.conf +# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 +# Also note the create-new-then-rename dance for rofiles-fuse compat +if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then + (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