--- trunk/installer-simple/bin/alxinstall-ng.sh.in	2014/01/03 13:12:33	2320
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/03 14:07:34	2335
@@ -1,31 +1,39 @@
-#!/bin/sh
+#!/bin/bash
+# $Id$
 #
-# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $
-#
-# AutoSta_LX Installation Script
+# Simple Installation Script
+# merged from alxinstall-ng and mcore-installer
 #
 # Niels Rogalla <niro@magellan-linux.de>
-#		<rogalla@augusta-bochum.de>
-#
-#
-# Install Navigation Gui
 #
 
+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/alxinstall-ng/functions/findhdd.sh > /dev/null
-### bugfix ###############################
-cdromdev="$(echo ${cdromdev} | sed 's/ //')"
-########################################
+# includes
+source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
 
 ### System/Config Version
 VERSION="%VERSIONTAG%"
-TITLE="alxinstall-ng - ${VERSION}"
+TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
-CDPATH="/mnt/cdrom"
-INSTALLPATH="/mnt/magellan"
+CDPATH="${DEFAULT_CDPATH}"
+INSTALLPATH="${DEFAULT_INSTALLPATH}"
 
 ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1
 CURRENTLINE=0
@@ -46,7 +54,7 @@
 FORMFACTOR="desktop"
 
 # target filesystem
-FORMAT_FILESYSTEM="ext4"
+FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
 
 #################################################
 #		  DIALOG BOXEN			#