--- trunk/installer-simple/bin/installer.sh.in 2014/01/07 14:25:34 2436 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/07 14:37:35 2439 @@ -438,8 +438,8 @@ setup_hdd_partitions_manual() { ROOTHDD="${HDD}1" - - ## hdds partitionieren manual + SWAPHDD="" + BOOTHDD="" cfdisk ${HDD} || dialog_die } @@ -574,13 +574,6 @@ rm ${INSTALLROOT}/root/.installrc } -is_initrd_supported() -{ - # only generate initrds if the cmd exists - [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0 - return 1 -} - install_initrd_chroot() { # only generate initrds if the cmd exists @@ -642,25 +635,6 @@ return 1 } -get_uuid() -{ - local UUID - local SEC_TYPE - local TYPE - - local dev="$1" - [[ -z ${dev} ]] && dialog_die "no dev given" - - # check if given device is already an UUID - if [[ ${dev/UUID=/}x != ${dev}x ]] - then - eval "${dev}" - else - eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //') - fi - echo "${UUID}" -} - install_system_settings() { # schreibe fstab