diff --git a/host-id.sh b/host-id.sh
new file mode 100644
index 0000000..ea1d969
--- /dev/null
+++ b/host-id.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+
+
+cp \
+	/etc/hostid \
+	/mnt/etc/
diff --git a/pre-inst.sh b/pre-inst.sh
index 41dafbd..098ba7f 100755
--- a/pre-inst.sh
+++ b/pre-inst.sh
@@ -160,9 +160,7 @@ mount \
 	/sys \
 	/mnt/sys
 
-cp \
-	/etc/hostid \
-	/mnt/etc/
+"${baseDir}/host-id.sh"
 
 if [[ "${ID}" == 'fedora' ]]; then
 	"${baseDir}/fedora.sh" --resolv-conf