rc.d: Generate machine-id from hostid_save

rc.d/hostid_save saves a UUID generated by rc.d/hostid in /etc/hostid.
Store the same UUID, without hyphens, in /etc/machine-id.  The hypĥens
are removed with a shell function because hostid_save runs before file
systems are mounted so other tools may not be available yet.

This eliminates some duplication between hostid and machine-id and for
virtual machines machine-id now contains the UUID configured in the
hypervisor like it does on Linux.

Reviewed by:	delphij
Discussed with:	bapt
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D38811

This commit is contained in:

Tijl Coosemans

2023-02-15 21:09:51 +01:00

parent 862aab6281

commit ecad3f5c4d

7 changed files with 25 additions and 49 deletions

									
										ObsoleteFiles.inc
									
		+3
		
												View File
												
				@@ -52,6 +52,9 @@

				#   xargs -n1 | sort | uniq -d;

				# done

				# 20230308: machine-id merged into hostid_save

				OLD_FILES+=etc/rc.d/machine-id

				# 20230306: remove tzsetwall(3)

				OLD_FILES+=usr/share/man/man3/tzsetwall.3.gz