--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:13:26	2399
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:18:21	2403
@@ -22,13 +22,20 @@
 	exit 1
 }
 
-# configuration
-if [ -e %SYSCONFDIR%/installer.conf ]
-then
-	source %SYSCONFDIR%/installer.conf
-else
-	die "/etc/installer.conf not found"
-fi
+# load common includes
+for inc in %SYSCONFDIR%/installer.conf \
+	${INSTALLER_LIBDIR}/functions/common.sh \
+	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
+	${INSTALLER_LIBDIR}/functions/hwdetection.sh \
+	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
+do
+	if [ -e ${inc} ]
+	then
+		source "${inc}"
+	else
+		die "'${inc}' not found"
+	fi
+done
 
 # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
 # -> now in images.conf
@@ -45,9 +52,6 @@
 	die "/mnt/cdrom/system/images.conf not found"
 fi
 
-# includes
-source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
-
 ### System/Config Version
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"