Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

Parent Directory | Revision Log | Patch

	revision 6845 by niro, Thu Jul 23 13:32:03 2015 UTC	revision 6846 by niro, Thu Jul 23 13:53:55 2015 UTC
#	Line 540  setup_hdd_partitions()	Line 540  setup_hdd_partitions()
540	## delete disk	## delete disk
541	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
542
543	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]	if [[ ${FLASHDISK} = 1 ]]
544	then	then
545	## setup one bootable partition	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
546	#1. n= new disk	then
547	#2. p= primary disk	## setup one bootable partition
548	#3. 1= first partition	# 1. n= new disk
549	#4. 2= default sector start // small disk needs more space for grub2 mbr sector	# 2. p= primary disk
550	#5. ''= defaul sector end	# 3. 1= first partition
551	#6. a= bootable flag	# 4. 2= default sector start // small disk needs more space for grub2 mbr sector
552	#7. 1= boot flag for partition 1	# 5. ''= defaul sector end
553	#8. w= write/quit	# 6. a= bootable flag
554	fdisk ${HDD} &> /dev/null << EOF	# 7. 1= boot flag for partition 1
555		# 8. n= new disk
556		#10. p= primary disk
557		#11. 2= second partition
558		#12. ''= default sector start
559		#13. ''= defaul sector end
560		#14. w= write/quit
561		fdisk ${HDD} &> /dev/null << EOF
562	n	n
563	p	p
564	1	1
565	2	2
566		+50M
567		a
568		1
569		n
570		p
571		2
572
573
574		w
575		EOF
576		else
577		## setup one bootable partition
578		# 1. n= new disk
579		# 2. p= primary disk
580		# 3. 1= first partition
581		# 4. ''= default sector start
582		# 5. ''= defaul sector end
583		# 6. a= bootable flag
584		# 7. 1= boot flag for partition 1
585		# 8. n= new disk
586		#10. p= primary disk
587		#11. 2= second partition
588		#12. ''= default sector start
589		#13. ''= defaul sector end
590		#14. w= write/quit
591		fdisk ${HDD} &> /dev/null << EOF
592		n
593		p
594		1
595
596		+50M
597	a	a
598	1	1
599		n
600		p
601		2
602
603
604	w	w
605	EOF	EOF
606		fi
607	else	else
608	## setup one bootable partition	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
609	#1. n= new disk	then
610	#2. p= primary disk	## setup one bootable partition
611	#3. 1= first partition	#1. n= new disk
612	#4. ''= default sector start	#2. p= primary disk
613	#5. ''= defaul sector end	#3. 1= first partition
614	#6. a= bootable flag	#4. 2= default sector start // small disk needs more space for grub2 mbr sector
615	#7. 1= boot flag for partition 1	#5. ''= defaul sector end
616	#8. w= write/quit	#6. a= bootable flag
617	fdisk ${HDD} &> /dev/null << EOF	#7. 1= boot flag for partition 1
618		#8. w= write/quit
619		fdisk ${HDD} &> /dev/null << EOF
620		n
621		p
622		1
623		2
624
625		a
626		1
627		w
628		EOF
629		else
630		## setup one bootable partition
631		#1. n= new disk
632		#2. p= primary disk
633		#3. 1= first partition
634		#4. ''= default sector start
635		#5. ''= defaul sector end
636		#6. a= bootable flag
637		#7. 1= boot flag for partition 1
638		#8. w= write/quit
639		fdisk ${HDD} &> /dev/null << EOF
640	n	n
641	p	p
642	1	1
#	Line 581  a	Line 646  a
646	1	1
647	w	w
648	EOF	EOF
649		fi
650	fi	fi
651	else	else
652	## hdds partitionieren manuell	## hdds partitionieren manuell
#	Line 946  run_install()	Line 1012  run_install()
1012
1013	case "${method}" in	case "${method}" in
1014	auto)	auto)
1015	export FORMAT_FILESYSTEM_BOOTHDD=""	if [[ ${FLASHDISK} = 1 ]]
1016	export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"	then
1017		export FORMAT_FILESYSTEM="f2fs"
1018		export FORMAT_FILESYSTEM_BOOTHDD="ext2"
1019		export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1020		else
1021		export FORMAT_FILESYSTEM_BOOTHDD=""
1022		export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1023		fi
1024	export INSTALL_METHOD="${method}"	export INSTALL_METHOD="${method}"
1025	;;	;;
1026	normal)	normal)

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.6845   changed lines   Added in v.6846