diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 9e629ab814..6c6e3b1fe1 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -3,7 +3,6 @@
 # Copyright (C) 2010 Vertical Communications
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-. /etc/diag.sh
 
 pi_ifname=
 pi_ip=192.168.1.1
diff --git a/package/base-files/files/lib/preinit/02_default_set_state b/package/base-files/files/lib/preinit/02_default_set_state
new file mode 100644
index 0000000000..df43395726
--- /dev/null
+++ b/package/base-files/files/lib/preinit/02_default_set_state
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+define_default_set_state() {
+	. /etc/diag.sh
+}
+
+boot_hook_add preinit_main define_default_set_state