[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Anthony G. Basile]

commit:     c30ef3723d222e36dc5c0ebc8d8190f991de73da
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:37:58 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:37:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c30ef372

Revert "targets/support/chroot-functions.sh: create an empty machine-id for 
systemd stages"

This reverts commit 716363ebd4796911c6fbebfcd22ce97e1295df33.

This breaks sys-apps/dbus which calls `dbus-uuidgen --ensure=/etc/machine-id`.  
If
machine-id exists, it is not overwritten, thus leaving behind an empty 
machine-id
for non-systemd systems.  It is therefore better to remove the file.

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2ab35141..67874a03 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -223,7 +223,7 @@ cleanup_stages() {
                stage1|stage2|stage3|system)
                        rm -f /var/lib/portage/world
                        touch /var/lib/portage/world
-                       >/etc/machine-id
+                       rm -f /etc/machine-id
                        ;;
                *)
                        echo "Skipping removal of world file for ${clst_target}"