Diff of /trunk/installer-simple/bin/installer.sh.in

Parent Directory | Revision Log | Patch

	revision 2344 by niro, Fri Jan 3 15:01:06 2014 UTC	revision 2397 by niro, Tue Jan 7 13:03:58 2014 UTC
#	Line 16  INSTALLER_LIBDIR="%LIBDIR%"	Line 16  INSTALLER_LIBDIR="%LIBDIR%"
16	# -> now in images.conf	# -> now in images.conf
17	CURRENTLINE=0	CURRENTLINE=0
18
19		die()
20		{
21		echo "Error: $@"
22		exit 1
23		}
24
25	# configuration	# configuration
26	if [ -e %SYSCONFDIR%/installer.conf ]	if [ -e %SYSCONFDIR%/installer.conf ]
27	then	then
#	Line 70  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}	Line 76  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}
76	#  DIALOG BOXEN #	#  DIALOG BOXEN #
77	#################################################	#################################################
78
	die()
	{
	echo "Error: $@"
	exit 1
	}
79	dialog_die()	dialog_die()
80	{	{
81	ERROR="$1"	ERROR="$1"
#	Line 180  dialog_hardware_detection()	Line 180  dialog_hardware_detection()
180	local i	local i
181	local hwtmp	local hwtmp
182
183	if [ -x $(which mktemp &> /dev/null) ]	if [ -x $(type -P mktemp) ]
184	then	then
185	hwtmp="$(mktemp)"	hwtmp="$(mktemp)"
186	else	else
#	Line 831  CHROOTEOF	Line 831  CHROOTEOF
831
832	is_uuid_supported()	is_uuid_supported()
833	{	{
834	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]	if [[ -x $(type -P busybox.mkinitrd) ]]
835	then	then
836	# only detect uuids if supported	# only detect uuids if supported
837	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.2344   changed lines   Added in v.2397