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

Parent Directory | Revision Log | Patch

	revision 6837 by niro, Thu Jul 23 12:49:52 2015 UTC	revision 6838 by niro, Thu Jul 23 12:51:57 2015 UTC
#	Line 190  dialog_hardware_detection()	Line 190  dialog_hardware_detection()
190	local i	local i
191	local hwtmp	local hwtmp
192
193	if [ -x $(which mktemp &> /dev/null) ]	if [ -x $(type -P mktemp) ]
194	then	then
195	hwtmp="$(mktemp)"	hwtmp="$(mktemp)"
196	else	else
#	Line 816  is_uuid_supported()	Line 816  is_uuid_supported()
816	# use the blkid from util-linux instead of busybox	# use the blkid from util-linux instead of busybox
817	if [[ ${FORMAT_FILESYSTEM} = f2fs ]]	if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
818	then	then
819	if [[ -x $(which blkid &> /dev/null) ]]	if [[ -x $(type -P blkid) ]]
820	then	then
821	return 0	return 0
822	fi	fi
823	else	else
824	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]	if [[ -x $(type -P busybox.mkinitrd) ]]
825	then	then
826	# only detect uuids if supported	# only detect uuids if supported
827	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]

---

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

Legend: Removed from v.6837   changed lines   Added in v.6838