/[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

Parent Directory | Revision Log | View Patch Patch

-revision 2573 by niro,
Mon Jul  4 21:24:46 2011 UTC
+revision 6799 by niro,
Wed Jul 22 11:08:40 2015 UTC
 Line 34 
 CURRENTLINE=0
  # standard kernel opts
  KERNELOPTS="quiet video=1024x768"
+ # grub options
+ GRUBLEGACYOPTS=""
+ GRUB2OPTS=""
+ GRUB2GFXPAYLOAD="1024x768x16,1024x768"
+ # fdisk options
+ FDISKPARTIONBELOW256MB=0
  # default specialdevices
  SPECIALDEVICE=""
+ FORMFACTOR="desktop"
  # target filesystem
  FORMAT_FILESYSTEM="ext4"
-Line 86 
 dialog_setup_hdd_info()
+Line 95 
 dialog_setup_hdd_info()
  		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
  }
- dialog_setup_hdd_info_flash()
+ dialog_setup_hdd_info_simple()
  {
  	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
-Line 136 
 dialog_setup_system_menu()
+Line 145 
 dialog_setup_system_menu()
  	then
  		case "${i}" in
  			"1") run_install_auto ;;
-         		"2") run_install_normal ;;
+ 			"2") run_install_normal ;;
- 			"3") run_install_flash ;;
+ 			"3") run_install_simple ;;
  			"") dialog_setup_system_menu;;
  		esac
  	fi
-Line 199 
 dialog_hardware_detection()
+Line 208 
 dialog_hardware_detection()
  	# other devices
  	run_hardware_detection
  	case "${SPECIALDEVICE}" in
- 		zotac) echo "	\n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+ 		zotac*) echo "	\n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
- 		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+ 		rangee) echo "	\n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+ 		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+ 		i845) echo "	\n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+ 		*) echo "	\n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
  	esac
+ 	if [[ ${FORMFACTOR} = laptop ]]
+ 	then
+ 		echo "	\n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
+ 	fi
- 	echo "	\" 13 70" >> ${hwtmp}
+ 	echo "	\" 14 70" >> ${hwtmp}
  	chmod a+x ${hwtmp}
  	${hwtmp}
-Line 252 
 dialog_setup_hdd_partitions_manuell()
+Line 268 
 dialog_setup_hdd_partitions_manuell()
  	fi
  }
- dialog_setup_hdd_partitions_manuell_flash()
+ dialog_setup_hdd_partitions_manuell_simple()
  {
  	local i
-Line 284 
 dialog_setup_hdd_partitions_manuell_flas
+Line 300 
 dialog_setup_hdd_partitions_manuell_flas
  		[[ ${RES} -eq 1 ]] && return 1
  		if [[ ${RES} -eq 0 ]]
  		then
- 			dialog_setup_hdd_info_flash
+ 			dialog_setup_hdd_info_simple
- 			setup_hdd_partitions_manuell_flash
+ 			setup_hdd_partitions_manuell_simple
  		fi
  	fi
  }
-Line 417 
 dialog_main()
+Line 433 
 dialog_main()
  		if [[ ${RES} -eq 0 ]]
  		then
  			case ${METHOD} in
-         			"1") dialog_setup_system_menu ;;
+ 				"1") dialog_setup_system_menu ;;
  				"2") dialog_hardware_detection ;;
  				"3") install_do_reboot ;;
  				"4") /bin/bash --login -i ;;
-Line 431 
 dialog_main()
+Line 447 
 dialog_main()
  #################################################
  run_hardware_detection()
  {
+ 	local hwinfo
+ 	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
  	# check for special devices/clients:
  	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
  	local removable=0
- 	if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
+ 	if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
  	then
  		for i in /sys/block/[hs]d*/removable
  		do
-Line 444 
 run_hardware_detection()
+Line 464 
 run_hardware_detection()
  			fi
  		done
- 		export KERNELOPTS="${KERNELOPTS} rootdelay=8"
+ 		# only add this for grub legacy, grub2 detect these settings on its own
- 		export SPECIALDEVICE="zotac"
+ 		export GRUBLEGACYOPTS="rootdelay=8"
+ 		# there are two zotac types in the wild, nvidia based gfx and intel
+ 		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
+ 		then
+ 			export SPECIALDEVICE="zotac_nvidia"
+ 		else
+ 			export SPECIALDEVICE="zotac_intel"
+ 		fi
+ 	fi
+ 	# check for special devices/clients:
+ 	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
+ 	if [[ ! -z $(echo "${hwinfo}" | grep -i CLE266) ]]
+ 	then
+ 		# for a rangee always define partion startblock +1
+ 		export FDISKPARTIONBELOW256MB="1"
+ 		export SPECIALDEVICE="rangee"
+ 		export GRUBLEGACYOPTS=""
+ 	fi
+ 	# check for special devices/clients:
+ 	# check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
+ 	if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
+ 	then
+ 		export SPECIALDEVICE="maxdata"
+ 		export GRUBLEGACYOPTS=""
+ 	fi
+ 	# check for i845 Chipsets and disable KMS and use 915 drm driver
+ 	if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
+ 	then
+ 		export SPECIALDEVICE="i845"
+ 		# unset default video=1024x768 opt or the drm driver breaks
+ 		export KERNELOPTS="quiet"
+ 		export GRUBLEGACYOPTS=""
+ 		# enable full kms support
+ 		export GRUB2GFXPAYLOAD="keep"
+ 	fi
+ 	# check for radeon gfxcards
+ 	if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
+ 	then
+ 		# enable full kms support
+ 		export GRUB2GFXPAYLOAD="keep"
+ 	fi
+ 	# check for special devices/clients:
+ 	# check for laptops and activate cpufreq scaling
+ 	if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
+ 	then
+ 		export FORMFACTOR="laptop"
+ 		export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
+ 	fi
+ }
+ hdd_size_below_256mb()
+ {
+ 	local hdd="$1"
+ 	local size
+ 	local retval
+ 	[[ -z ${hdd} ]] && die "Error: get_hdd_size() no \$hdd given!"
+ 	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
+ 	if [[ ${size} -le 257000000 ]]
+ 	then
+ 		retval="0"
+ 	else
+ 		retval="1"
  	fi
+ 	return "${retval}"
  }
  setup_hdd_partitions_auto()
  {
  	ROOTHDD="${HDD}1"
+ 	# run this only if FDISKPARTITIONBELOW256MB is not already 1
+ 	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+ 	then
+ 		if hdd_size_below_256mb ${HDD}
+ 		then
+ 			FDISKPARTIONBELOW256MB=1
+ 		else
+ 			FDISKPARTIONBELOW256MB=0
+ 		fi
+ 	fi
  	## delete disk
  	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
- 	## setup one bootable partition
+ 	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
- 	#1. n= new disk
+ 	then
- 	#2. p= primary disk
+ 		## setup one bootable partition
- 	#3. 1= first partition
+ 		#1. n= new disk
- 	#4. ''= default sector start
+ 		#2. p= primary disk
- 	#5. ''= defaul sector end
+ 		#3. 1= first partition
- 	#6. a= bootable flag
+ 		#4. 2= default sector start // small disk needs more space for grub2 mbr sector
- 	#7. 1= boot flag for partition 1
+ 		#5. ''= defaul sector end
- 	#8. w= write/quit
+ 		#6. a= bootable flag
- 	fdisk ${HDD} &> /dev/null << EOF
+ 		#7. 1= boot flag for partition 1
+ 		#8. w= write/quit
+ 		fdisk ${HDD} &> /dev/null << EOF
+ n
+ p
+ a
+ 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
-Line 475 
 a
+Line 597 
 a
  w
  EOF
+ 	fi
  }
  setup_hdd_partitions_manuell()
-Line 487 
 setup_hdd_partitions_manuell()
+Line 610 
 setup_hdd_partitions_manuell()
  	cfdisk ${HDD} || die
  }
- setup_hdd_partitions_manuell_flash()
+ setup_hdd_partitions_manuell_simple()
  {
  	ROOTHDD="${HDD}1"
-Line 502 
 setup_hdd_format()
+Line 625 
 setup_hdd_format()
  	mke2fs -j -q ${ROOTHDD} || die
  }
- setup_hdd_format_flash()
+ setup_hdd_format_simple()
  {
  	mke2fs -j -q ${ROOTHDD} || die
  }
-Line 516 
 install_mount_rootfs()
+Line 639 
 install_mount_rootfs()
  	cd ${INSTALLPATH} || die
  }
- install_mount_rootfs_flash()
+ install_mount_rootfs_simple()
  {
  	mount ${ROOTHDD} ${INSTALLPATH} || die
  	install -d ${INSTALLPATH}/boot || die
-Line 547 
 install_bootsector_chroot()
+Line 670 
 install_bootsector_chroot()
  		if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
  		then
  			sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
+ 			sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
  		else
  			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
+ 			echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
  		fi
  		echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
  		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
-Line 591 
 install_bootsector_chroot()
+Line 716 
 install_bootsector_chroot()
  		echo "# normal boot" >> ${grubconf} || die
  		echo "title ${KRNVER}" >> ${grubconf} || die
  		echo "root (hd0,0)" >> ${grubconf} || die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
  		if is_initrd_supported
  		then
  			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-Line 602 
 install_bootsector_chroot()
+Line 727 
 install_bootsector_chroot()
  		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
  		echo "lock"  >> ${grubconf} || die
  		echo "root (hd0,0)" >> ${grubconf} || die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
  		if is_initrd_supported
  		then
  			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-Line 612 
 install_bootsector_chroot()
+Line 737 
 install_bootsector_chroot()
  		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
  		echo "lock"  >> ${grubconf} || die
  		echo "root (hd0,0)" >> ${grubconf} || die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
  		if is_initrd_supported
  		then
  			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-Line 657 
 install_initrd_chroot()
+Line 782 
 install_initrd_chroot()
  	PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
  	SATAMODS="sata_via sata_sis sata_nv"
  	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
- 	FBMODS="uvesafb"
+ 	OTHERMODS=""
+ 	case ${SPECIALDEVICE} in
+ 		zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
+ 		zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
+ 		rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
+ 		# not working with kms enabled drivers -> segfaults
+ 		#maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
+ 		maxdata) FBMODS="" ;;
+ 		*) FBMODS="uvesafb" ;;
+ 	esac
+ 	if [[ ${FORMFACTOR} = laptop ]]
+ 	then
+ 		OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
+ 	fi
  	# install an appropriate uvesafb.conf
  	install -d ${INSTALLPATH}/etc/modprobe.d || die
  	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
+ 	# install an appropriate viafb.conf
+ 	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die
+ 	# install an appropriate i810fb.conf
+ 	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
  	cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
- echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
+ echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
  exit 0
  CHROOTEOF
-Line 731 
 install_system_settings()
+Line 876 
 install_system_settings()
  	# install network config skeleton
  	install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
+ 	# intel framebufer quirk
+ 	if [[ -e /proc/fb ]]
+ 	then
+ 		if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
+ 		then
+ 			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+ 			if [[ ${fbdev} != 0 ]]
+ 			then
+ 				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
+ 			fi
+ 		fi
+ 	fi
  }
- install_system_settings_flash()
+ install_system_settings_simple()
  {
  	# schreibe fstab
  	if is_uuid_supported
-Line 754 
 install_umount_rootfs()
+Line 912 
 install_umount_rootfs()
  	swapoff ${SWAPHDD} || die
  }
- install_umount_rootfs_flash()
+ install_umount_rootfs_simple()
  {
  	cd /
  	umount ${INSTALLPATH} || die
-Line 791 
 run_install_normal()
+Line 949 
 run_install_normal()
  	dialog_install_successful
  }
- run_install_flash()
+ run_install_simple()
  {
  	dialog_hardware_detection
- 	dialog_setup_hdd_partitions_manuell_flash
+ 	dialog_setup_hdd_partitions_manuell_simple
  	dialog_setup_hdd_format
- 	setup_hdd_format_flash > /dev/null
+ 	setup_hdd_format_simple > /dev/null
- 	install_mount_rootfs_flash
+ 	install_mount_rootfs_simple
  	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
  	dialog_install_settings
  	sleep 1
- 	install_system_settings_flash
+ 	install_system_settings_simple
  	install_initrd_chroot
  	dialog_install_bootsector
  	install_bootsector_chroot
- 	install_umount_rootfs_flash
+ 	install_umount_rootfs_simple
  	dialog_install_successful
  }
-Line 819 
 run_install_auto()
+Line 977 
 run_install_auto()
  	dialog_setup_hdd_partitions_auto
  	dialog_setup_hdd_format
- 	setup_hdd_format_flash > /dev/null
+ 	setup_hdd_format_simple > /dev/null
- 	install_mount_rootfs_flash
+ 	install_mount_rootfs_simple
  	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
  	dialog_install_settings
  	sleep 1
- 	install_system_settings_flash
+ 	install_system_settings_simple
  	install_initrd_chroot
  	dialog_install_bootsector
  	install_bootsector_chroot
- 	install_umount_rootfs_flash
+ 	install_umount_rootfs_simple
  	dialog_install_successful
  }

 Legend:



Removed from v.2573
 


changed lines


 
Added in v.6799
 Legend:



Removed from v.2573
 


changed lines


 
Added in v.6799
-Removed from v.2573
+Added in v.6799