Diff of /mage/branches/alx-0_6_0/include/alx.minc

Parent Directory | Revision Log | Patch

	revision 2730 by niro, Mon Jul 4 20:10:20 2011 UTC	revision 2731 by niro, Thu Aug 11 14:30:15 2011 UTC
#	Line 57  alx_grub_update()	Line 57  alx_grub_update()
57
58	[ -z "${KERNEL_DESCRIPTION}" ] && KERNEL_DESCRIPTION="${KERNEL_IMAGE}"	[ -z "${KERNEL_DESCRIPTION}" ] && KERNEL_DESCRIPTION="${KERNEL_IMAGE}"
59
60		# check for special hardware
61		if [[ -x $(which hwinfo) ]]
62		then
63		# zotac devices
64		if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
65		then
66		grubopts="rootdelay=8"
67		echo "Special device 'ZOTAC' detected!"
68		fi
69		fi
70
71	# grub2	# grub2
72	if [[ -x /sbin/grub-mkconfig ]]	if [[ -x /sbin/grub-mkconfig ]]
73	then	then
#	Line 72  alx_grub_update()	Line 83  alx_grub_update()
83	install -m0644 /$(mlibdir)/grub/*/video.lst /boot/grub/video.lst	install -m0644 /$(mlibdir)/grub/*/video.lst /boot/grub/video.lst
84	fi	fi
85
86		# fix grubconfig for special devices
87		if [[ -n ${grubopts} ]]
88		then
89		sed -i "s:^\(export GRUB_CMDLINE_LINUX=\).*:\1\"${grubopts}\":" /etc/conf.d/grub
90		fi
91
92	# update grub.cfg	# update grub.cfg
93	LC_ALL=C grub-mkconfig -o ${grub2conf}	LC_ALL=C grub-mkconfig -o ${grub2conf}
94
#	Line 109  alx_grub_update()	Line 126  alx_grub_update()
126	done	done
127	IFS="${OLD_IFS}"	IFS="${OLD_IFS}"
128
	# check for special hardware
	if [[ -x $(which hwinfo) ]]
	then
	# zotac devices
	if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
	then
	grubopts="rootdelay=8"
	echo "Special device 'ZOTAC' detected!"
	fi
	fi
129	# fix description	# fix description
130	: > ${grubconf}	: > ${grubconf}
131	echo "default 0" >> ${grubconf}	echo "default 0" >> ${grubconf}

---

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

Legend: Removed from v.2730   changed lines   Added in v.2731