--- trunk/installer-simple/bin/installer.sh.in 2014/07/02 14:39:45 2652 +++ trunk/installer-simple/bin/installer.sh.in 2014/07/03 08:01:05 2653 @@ -45,6 +45,7 @@ TITLE="${DEFAULT_TITLE} - ${VERSION}" # some sane defaults +LIVEROOT="${DEFAULT_LIVEROOT}" IMAGEROOT="${DEFAULT_IMAGEROOT}" INSTALLROOT="${DEFAULT_INSTALLROOT}" KERNELPKG="${DEFAULT_KERNELPKG}" @@ -187,9 +188,9 @@ # all disks but exclude ramdisks export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d') # remove the boot device from ALL_DISKS if it was an usbstick - if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]] + if [[ $(grep '[[:space:]]${LIVEROOT}[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]] then - bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')" + bootdev=$(grep "[[:space:]]${LIVEROOT}[[:space:]]" /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g') export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}") fi export ALL_CDROMS="$(get_hwinfo cdrom)"