From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 30 Sep 2011 16:36:35 +0000 (-0700)
Subject: Revert "Stabilize the hostid for RPM installations."
X-Git-Tag: spl-0.6.0-rc6~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39a87c69211aceef23889ceb4a33291e476237b9;p=spl

Revert "Stabilize the hostid for RPM installations."

Creating an /etc/hostid file as part of the rpm post install
causes problems for diskless systems which are sharing an image.
While it's still critical to ensure the hostid doesn't change
for zfs root filesystems.  This will now be done by setting
the /etc/hostid in the initramfs created by dracut.

This reverts commit 79593b0dec57ee94c5bb56cdc2770ebde81ecea9.
---

diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index ddeb260..e02d6c2 100644
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -233,17 +233,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/src/*
 
 %post
-# The /sbin/genhostid utility writes a random value to the /etc/hostid
-# file, which means that using it here will break upgrades on systems
-# that already have spl installed.
-if [ ! -f /etc/hostid ]; then
-	HOSTID=$(hostid)
-	AA=$(echo $HOSTID | cut -b 1,2)
-	BB=$(echo $HOSTID | cut -b 3,4)
-	CC=$(echo $HOSTID | cut -b 5,6)
-	DD=$(echo $HOSTID | cut -b 7,8)
-	"$(which printf)" "\x$DD\x$CC\x$BB\x$AA" >"/etc/hostid"
-fi
 if [ -f /boot/System.map-%{kver} ]; then
 	depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
 else