--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2015/07/23 13:35:42 6845 +++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2015/07/23 13:53:55 6846 @@ -540,38 +540,103 @@ ## delete disk dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die - if [[ ${FDISKPARTIONBELOW256MB} = 1 ]] + if [[ ${FLASHDISK} = 1 ]] then - ## setup one bootable partition - #1. n= new disk - #2. p= primary disk - #3. 1= first partition - #4. 2= default sector start // small disk needs more space for grub2 mbr sector - #5. ''= defaul sector end - #6. a= bootable flag - #7. 1= boot flag for partition 1 - #8. w= write/quit - fdisk ${HDD} &> /dev/null << EOF + if [[ ${FDISKPARTIONBELOW256MB} = 1 ]] + then + ## setup one bootable partition + # 1. n= new disk + # 2. p= primary disk + # 3. 1= first partition + # 4. 2= default sector start // small disk needs more space for grub2 mbr sector + # 5. ''= defaul sector end + # 6. a= bootable flag + # 7. 1= boot flag for partition 1 + # 8. n= new disk + #10. p= primary disk + #11. 2= second partition + #12. ''= default sector start + #13. ''= defaul sector end + #14. w= write/quit + fdisk ${HDD} &> /dev/null << EOF n p 1 2 ++50M +a +1 +n +p +2 + + +w +EOF + else + ## setup one bootable partition + # 1. n= new disk + # 2. p= primary disk + # 3. 1= first partition + # 4. ''= default sector start + # 5. ''= defaul sector end + # 6. a= bootable flag + # 7. 1= boot flag for partition 1 + # 8. n= new disk + #10. p= primary disk + #11. 2= second partition + #12. ''= default sector start + #13. ''= defaul sector end + #14. w= write/quit + fdisk ${HDD} &> /dev/null << EOF +n +p +1 ++50M a 1 +n +p +2 + + w EOF + fi else - ## setup one bootable partition - #1. n= new disk - #2. p= primary disk - #3. 1= first partition - #4. ''= default sector start - #5. ''= defaul sector end - #6. a= bootable flag - #7. 1= boot flag for partition 1 - #8. w= write/quit - fdisk ${HDD} &> /dev/null << EOF + if [[ ${FDISKPARTIONBELOW256MB} = 1 ]] + then + ## setup one bootable partition + #1. n= new disk + #2. p= primary disk + #3. 1= first partition + #4. 2= default sector start // small disk needs more space for grub2 mbr sector + #5. ''= defaul sector end + #6. a= bootable flag + #7. 1= boot flag for partition 1 + #8. w= write/quit + fdisk ${HDD} &> /dev/null << EOF +n +p +1 +2 + +a +1 +w +EOF + else + ## setup one bootable partition + #1. n= new disk + #2. p= primary disk + #3. 1= first partition + #4. ''= default sector start + #5. ''= defaul sector end + #6. a= bootable flag + #7. 1= boot flag for partition 1 + #8. w= write/quit + fdisk ${HDD} &> /dev/null << EOF n p 1 @@ -581,6 +646,7 @@ 1 w EOF + fi fi else ## hdds partitionieren manuell @@ -946,8 +1012,15 @@ case "${method}" in auto) - export FORMAT_FILESYSTEM_BOOTHDD="" - export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" + if [[ ${FLASHDISK} = 1 ]] + then + export FORMAT_FILESYSTEM="f2fs" + export FORMAT_FILESYSTEM_BOOTHDD="ext2" + export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" + else + export FORMAT_FILESYSTEM_BOOTHDD="" + export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}" + fi export INSTALL_METHOD="${method}" ;; normal)