commit c817ba1 - test for systemd-machine-id-setup

andrew bezella <[email protected]>
Newsgroups gmane.linux.debian.fai
Organization internet archive
Message-ID <[email protected]>
hello -

i'm in the process of upgrading from fai 5.0.3 to fai 5.8.9.  as part
of that i'm looking over updates to the fai-config repo and i noticed
that in commit c817ba1 [1] this change was made:

diff --git a/scripts/DEBIAN/40-misc b/scripts/DEBIAN/40-misc
index 8308bbe..d1c3108 100755
--- a/scripts/DEBIAN/40-misc
+++ b/scripts/DEBIAN/40-misc
@@ -28,7 +28,8 @@ elif [ -f $target/lib/systemd/system/[email protected] ]; then
     sed -i -e 's#sbin/agetty --noclear#sbin/agetty -f /etc/issue.linuxlogo --noclear#' $target/lib/systemd/system/[email protected]
 fi
 
-if [ ! -f $target/etc/machine-id -a -f $target/bin/systemd-machine-id-setup ]; then
+# recreate machine-id if the file is empty
+if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)"  = X0 -a -f /bin/systemd-machine-id-setup ]; then
     $ROOTCMD systemd-machine-id-setup
 fi
 

and i was wondering if the removal of "$target" in the "-f" test for
`systemd-machine-id-setup` was intentional?  since the next line is
"$ROOTCMD systemd-machine-id-setup" it would seem that the test should
still be for "-f $target/bin/systemd-machine-id-setup"?

sorry for the noise if i'm just missing something obvious, i'm still
getting my head back into the world of fai.

tia,

	andy

1. https://github.com/faiproject/fai-config/commit/c817ba115109c8d43b098bfe20313207d0b33621

-- 
andrew bezella <[email protected]>
internet archive
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.