--- trunk/installer-simple/bin/installer.sh.in	2014/01/08 13:20:29	2500
+++ trunk/installer-simple/bin/installer.sh.in	2014/04/02 11:28:21	2642
@@ -40,27 +40,12 @@
 	fi
 done
 
-# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
-# -> now in images.conf
-CDIMAGENAME=""
-TOTALLINES=""
-CURRENTLINE=0
-if [ -e /mnt/cdrom/system/images.conf ]
-then
-	source /mnt/cdrom/system/images.conf
-	# check if all required variables are set
-	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
-	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
-else
-	die "/mnt/cdrom/system/images.conf not found"
-fi
-
 ### System/Config Version
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
 # some sane defaults
-CDROOT="${DEFAULT_CDROOT}"
+IMAGEROOT="${DEFAULT_IMAGEROOT}"
 INSTALLROOT="${DEFAULT_INSTALLROOT}"
 KERNELPKG="${DEFAULT_KERNELPKG}"
 KERNELOPTS="${DEFAULT_KERNELOPTS}"
@@ -71,6 +56,20 @@
 FORMFACTOR="${DEFAULT_FORMFACTOR}"
 FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
 
+# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
+# -> now in images.conf
+CDIMAGENAME=""
+TOTALLINES=""
+CURRENTLINE=0
+if [ -e ${IMAGEROOT}/images.conf ]
+then
+	source ${IMAGEROOT}/images.conf
+	# check if all required variables are set
+	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in ${IMAGEROOT}/images.conf"
+	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in ${IMAGEROOT}/images.conf"
+else
+	die "${IMAGEROOT}/images.conf not found"
+fi
 
 ### helper scripts ###
 
@@ -288,7 +287,7 @@
 install_system_image()
 {
 	pushd ${INSTALLROOT} > /dev/null
-	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
+	tar xvjpf ${IMAGEROOT}}/${CDIMAGENAME} -C ${INSTALLROOT}
 	popd > /dev/null
 }