--- trunk/installer-simple/bin/installer.sh.in	2014/01/03 13:58:23	2332
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/03 14:07:34	2335
@@ -7,16 +7,26 @@
 # Niels Rogalla <niro@magellan-linux.de>
 #
 
-source %SYSCONFDIR%/installer.conf
+INSTALLER_LIBDIR="%LIBDIR%"
+
+# configuration
+if [ -e %SYSCONFDIR%/installer.conf ]
+then
+	source %SYSCONFDIR%/installer.conf
+else
+	die "/etc/installer.conf not found"
+fi
 
 #images: (get ${CDIMAGENAME})
-source /mnt/cdrom/system/images.conf
+if [ -e /mnt/cdrom/system/images.conf ]
+then
+	source /mnt/cdrom/system/images.conf
+else
+	die "/mnt/cdrom/system/images.conf not found"
+fi
 
-#Includes
-source /usr/lib/installer/functions/findhdd.sh > /dev/null
-### bugfix ###############################
-cdromdev="$(echo ${cdromdev} | sed 's/ //')"
-########################################
+# includes
+source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
 
 ### System/Config Version
 VERSION="%VERSIONTAG%"