From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F9F5158020 for ; Thu, 8 Dec 2022 16:55:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8F4EE0828; Thu, 8 Dec 2022 16:55:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0554E0828 for ; Thu, 8 Dec 2022 16:55:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9D9B340D5A for ; Thu, 8 Dec 2022 16:55:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50E175BF for ; Thu, 8 Dec 2022 16:55:55 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1670518482.5d869a12d47362055873f519a82313c6f40fdbdb.floppym@gentoo> Subject: [gentoo-commits] data/gentoo-news:master commit in: 2022-12-01-systemd-usrmerge/ X-VCS-Repository: data/gentoo-news X-VCS-Files: 2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt X-VCS-Directories: 2022-12-01-systemd-usrmerge/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 5d869a12d47362055873f519a82313c6f40fdbdb X-VCS-Branch: master Date: Thu, 8 Dec 2022 16:55:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b46728e-5cde-4026-bb72-9cc9c0610ec8 X-Archives-Hash: e1c51d06a1e34181f13dbdf3dcaf5e8f commit: 5d869a12d47362055873f519a82313c6f40fdbdb Author: Mike Gilbert gentoo org> AuthorDate: Thu Dec 8 16:44:33 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Dec 8 16:54:42 2022 +0000 URL: https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=5d869a12 2022-12-01-systemd-usrmerge: rework steps based on feedback Bug: https://bugs.gentoo.org/884655 Signed-off-by: Mike Gilbert gentoo.org> .../2022-12-01-systemd-usrmerge.en.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt b/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt index 4bf3e05..be1870c 100644 --- a/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt +++ b/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt @@ -1,7 +1,7 @@ Title: /usr merge for systemd users Author: Mike Gilbert Posted: 2022-12-01 -Revision: 2 +Revision: 3 News-Item-Format: 2.0 Display-If-Installed: sys-apps/systemd @@ -22,14 +22,19 @@ To migrate a system to merged-usr, follow this procedure: 2. Install sys-apps/merge-usr. -3. Run the merge-usr script in a root shell (not using 'sudo', as a precautionary - measure). The --dryrun option may be used to check for error conditions - before running the script for real. +3. Run "merge-usr --dryrun" as root to check for conflicts. These will + appear with the word ERROR at the start of the line. -4. Switch to a merged-usr profile. +4. Resolve any conflicts. This may involve deleting duplicate files. If + in doubt, seek support in a Gentoo support channel. + +5. Run the merge-usr script from a root shell. Avoid running it via sudo + directly to avoid locking yourself out if an unexpected error occurs. + +6. Switch to a merged-usr profile. eg. eselect profile set default/linux/amd64/17.1/systemd/merged-usr -5. Run emerge with the --newuse or --changed-use option to rebuild +7. Run emerge with the --newuse or --changed-use option to rebuild any packages that have a "split-usr" USE flag. eg. emerge -uDN @world