reactivate machine-id config

bin/artix-live.in

@@ -41,9 +41,9 @@ livetimer=$(get_timer_ms)
 configure_sudoers_d
 echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-# livetimer=$(get_timer_ms)
-# configure_machine_id
-# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+livetimer=$(get_timer_ms)
+configure_machine_id
+echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
 livetimer=$(get_timer_ms)
 configure_accountsservice "${username}"

data/rc/pacman-init.in

@@ -12,6 +12,6 @@ depend() {
 start() {
 	ebegin "Running pacman initialization"
 	/usr/bin/pacman-key --init &> /dev/null
-	/usr/bin/pacman-key --populate archlinux cromnix &> /dev/null
+	/usr/bin/pacman-key --populate archlinux artix &> /dev/null
 	eend $?
 }

lib/util-live.sh

@@ -269,17 +269,17 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-# configure_machine_id(){
-# 	if [ -e "/etc/machine-id" ] ; then
-# 		# delete existing machine-id
-# 		echo "Deleting existing machine-id ..." >> "${LOGFILE}"
-# 		rm /etc/machine-id
-# 	fi
-# 	# set unique machine-id
-# 	echo "Setting machine-id ..." >> "${LOGFILE}"
-# 	dbus-uuidgen --ensure=/etc/machine-id
-# 	ln -sf /etc/machine-id /var/lib/dbus/machine-id
-# }
+configure_machine_id(){
+	if [ -e "/etc/machine-id" ] ; then
+		# delete existing machine-id
+		echo "Deleting existing machine-id ..." >> "${LOGFILE}"
+		rm /etc/machine-id
+	fi
+	# set unique machine-id
+	echo "Setting machine-id ..." >> "${LOGFILE}"
+	dbus-uuidgen --ensure=/etc/machine-id
+	ln -sf /etc/machine-id /var/lib/dbus/machine-id
+}
 
 configure_sudoers_d(){
 	echo "%wheel  ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/g_wheel