--- trunk/installer-simple/bin/installer.sh.in 2015/07/31 09:54:20 2884 +++ trunk/installer-simple/bin/installer.sh.in 2015/07/31 10:09:08 2885 @@ -338,7 +338,7 @@ umount "${BOOTHDD}" fi - mkfs."${FORMAT_FILESYSTEM}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die + mkfs."${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die fi if [[ -n ${ROOTHDD} ]] @@ -350,7 +350,7 @@ umount "${ROOTHDD}" fi - mkfs."${FORMAT_FILESYSTEM}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die + mkfs."${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die fi } @@ -370,11 +370,11 @@ clearconfig if [[ -n ${BOOTHDD} ]] then - addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t1 1" + addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime\t1 1" fi if [[ -n ${ROOTHDD} ]] then - addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" + addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0" fi if [[ -n ${SWAPHDD} ]] then @@ -542,9 +542,18 @@ case "${method}" in auto) + export FORMAT_FILESYSTEM_BOOTHDD="" + export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" export INSTALL_METHOD="${method}" ;; normal) + export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}" + export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" + export INSTALL_METHOD="${method}" + ;; + single) + export FORMAT_FILESYSTEM_BOOTHDD="" + export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" export INSTALL_METHOD="${method}" ;; *)