--- trunk/installer-simple/bin/installer.sh.in 2014/01/07 14:42:51 2440 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/07 14:46:13 2441 @@ -514,12 +514,7 @@ [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz" # uuid support - if is_uuid_supported - then - my_roothdd="UUID=$(get_uuid ${ROOTHDD})" - else - my_roothdd="${ROOTHDD}" - fi + my_roothdd="UUID=$(get_uuid ${ROOTHDD})" : > ${grubconf} || dialog_die echo "default 0" >> ${grubconf} || dialog_die @@ -621,29 +616,10 @@ rm ${INSTALLROOT}/root/.installrc } -is_uuid_supported() -{ - if [[ -x $(type -P busybox.mkinitrd) ]] - then - # only detect uuids if supported - if [[ ! -z $(busybox.mkinitrd | grep blkid) ]] - then - return 0 - fi - fi - - return 1 -} - install_system_settings() { # schreibe fstab - if is_uuid_supported - then - echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die - else - echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die - fi + echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die # not needed busybox loads all with swapon -a, even if not mentioned in fstab #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die