aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-03-03 21:37:58 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-03-03 21:37:58 -0500
commitc30ef3723d222e36dc5c0ebc8d8190f991de73da (patch)
tree226eaae2219c4c16cfcaf0f384e6004a16647587
parenttargets/support/chroot-functions.sh: create an empty machine-id for systemd s... (diff)
downloadcatalyst-2.X.tar.gz
catalyst-2.X.tar.bz2
catalyst-2.X.zip
Revert "targets/support/chroot-functions.sh: create an empty machine-id for systemd stages"2.X
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.
-rwxr-xr-xtargets/support/chroot-functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2ab3514..67874a0 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}"