Diff of /tags/installer-simple-0_4_90_20140703_1/bin/installer.sh.in

Parent Directory | Revision Log | Patch

	revision 2344 by niro, Fri Jan 3 15:01:06 2014 UTC	revision 2419 by niro, Tue Jan 7 13:44:59 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	# configuration	die()
20	if [ -e %SYSCONFDIR%/installer.conf ]	{
21	then	echo "Error: $@"
22	source %SYSCONFDIR%/installer.conf	exit 1
23	else	}
24	die "/etc/installer.conf not found"
25	fi	# load common includes
26		for inc in %SYSCONFDIR%/installer.conf \
27		${INSTALLER_LIBDIR}/functions/common.sh \
28		${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29		${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30		${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
31		do
32		if [ -e ${inc} ]
33		then
34		source "${inc}"
35		else
36		die "'${inc}' not found"
37		fi
38		done
39
40	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
41	# -> now in images.conf	# -> now in images.conf
#	Line 39  else	Line 52  else
52	die "/mnt/cdrom/system/images.conf not found"	die "/mnt/cdrom/system/images.conf not found"
53	fi	fi
54
	# includes
	source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
55	### System/Config Version	### System/Config Version
56	VERSION="%VERSIONTAG%"	VERSION="%VERSIONTAG%"
57	TITLE="${DEFAULT_TITLE} - ${VERSION}"	TITLE="${DEFAULT_TITLE} - ${VERSION}"
58
59		# some sane defaults
60	CDROOT="${DEFAULT_CDROOT}"	CDROOT="${DEFAULT_CDROOT}"
61	INSTALLROOT="${DEFAULT_INSTALLROOT}"	INSTALLROOT="${DEFAULT_INSTALLROOT}"
62		KERNELPKG="${DEFAULT_KERNELPKG}"
63	# standard kernel opts	KERNELOPTS="${DEFAULT_KERNELOPTS}"
	KERNELOPTS="quiet video=1024x768"
	# grub options
64	GRUBLEGACYOPTS=""	GRUBLEGACYOPTS=""
65	GRUB2OPTS=""	GRUB2OPTS=""
	# fdisk options
66	FDISKPARTIONBELOW256MB=0	FDISKPARTIONBELOW256MB=0
	# default specialdevices
67	SPECIALDEVICE=""	SPECIALDEVICE=""
68	FORMFACTOR="desktop"	FORMFACTOR="${DEFAULT_FORMFACTOR}"
	# target filesystem
69	FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"	FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
70
71	#################################################	#################################################
72	#  DIALOG BOXEN #	#  DIALOG BOXEN #
73	#################################################	#################################################
74
75	die()	trap_exit()
76	{	{
77	echo "Error: $@"	is_mounted --location "${INSTALLROOT}/dev" && umount ${INSTALLROOT}/dev
78		is_mounted --location "${INSTALLROOT}/proc" && umount ${INSTALLROOT}/proc
79		is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
80		is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
81		is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
82
83		echo $"Installation aborted."
84	exit 1	exit 1
85	}	}
86
#	Line 86  dialog_die()	Line 94  dialog_die()
94
95	dialog_warning()	dialog_warning()
96	{	{
97	dialog \	local retval
98	--backtitle "${TITLE}" \
99	--colors \	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
100	--defaultno \	retval=$?
101	--yesno "\Z1 !!! Achtung !!! \Zn\n\n\	if [[ ${retval} -eq 1 ]]
	Diese Festplatte wird unwiederruflich geloescht werden.\n\n\
	Soll ich wirklich fortfahren ?" 10 70
	RES=$?
	if [[ ${RES} -eq 1 ]]
102	then	then
103	clear	clear
104	echo "Der Vorgang wurde abgebrochen."	echo $"The process was aborted."
105	exit 1	exit 1
106	fi	fi
107	}	}
108
109	dialog_setup_hdd_info()	dialog_setup_hdd_info()
110	{	{
111	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"	local SHDD="${HDD//\/dev\/}"
112
113	dialog \	messagebox -h $"[ Harddrive partitioning ]" \
114	--colors \	$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nBitte legen Sie 3 Partitionen an.\n\n\
	[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
	[ \Z3${SHDD}2\Zn ] Typ: \Z3Linux Swap\Zn mit ca. 256MB\n\
	[ \Z3${SHDD}3\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
	}
	dialog_setup_hdd_info_flash()
	{
	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
	dialog \
	--colors \
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nBitte legen Sie 1 Partition an.\n\n\
	[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\
	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
115	}	}
116
117	dialog_setup_hdd_info_auto()	dialog_setup_hdd_info_auto()
118	{	{
119	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="${HDD//\/dev\/}"
120
121	dialog \	messagebox -h $"[ Harddrive partitioning ]" \
122	--colors \	$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nAchtung!\n\
	Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
123	}	}
124
125	dialog_setup_system_menu()	dialog_setup_system_menu()
126	{	{
127	local i	local mode
128		local retval
129
130	i=$(dialog \	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
131	--backtitle "${TITLE}" \	$"1:Automatic setup (recommended)" \
132	--title "[ Festplatten Partitionierung ]" \	":" \
133	--cancel-label "Abbrechen" \	$":\Z1Expert modes:\Zn" \
134	--ok-label "Weiter" \	$"2:Common IDE-disk (manual setup)")
135	--stdout \	retval=$?
136	--colors \	[[ ${retval} -eq 1 ]] && return 1
137	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \	if [[ ${retval} -eq 0 ]]
	"1" "Automatisches Setup (Empfohlen)" \
	"" "" \
	"" "\Z1Experten Modi:\Zn" \
	"2" "Normale IDE-Disk (Manuell)" \
	"3" "Flash-Speicher (Manuell)")
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
138	then	then
139	case "${i}" in	case "${mode}" in
140	"1") run_install_auto ;;	"1") run_install_auto ;;
141	"2") run_install_normal ;;	"2") run_install_normal ;;
	"3") run_install_flash ;;
142	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
143	esac	esac
144	fi	fi
#	Line 177  dialog_setup_system_menu()	Line 146  dialog_setup_system_menu()
146
147	dialog_hardware_detection()	dialog_hardware_detection()
148	{	{
149	local i	local message
	local hwtmp
	if [ -x $(which mktemp &> /dev/null) ]
	then
	hwtmp="$(mktemp)"
	else
	hwtmp="/tmp/hwtmp.sh"
	fi
150
151	run_hardware_detection_disks	run_hardware_detection_disks
152
153	echo "dialog \\"  > ${hwtmp}	message+=$"Harddrives:\n"
	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
	echo "--stdout \\" >> ${hwtmp}
	echo "--colors \\" >> ${hwtmp}
	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
	echo " Festplatten:\n \\" >> ${hwtmp}
154
155	if [[ ! -z ${ALL_DISKS} ]]	if [[ ! -z ${ALL_DISKS} ]]
156	then	then
157	for i in ${ALL_DISKS}	for i in ${ALL_DISKS}
158	do	do
159	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn "
160	done	done
161		message+="\n"
162	fi	fi
163
164	if [[ ! -z ${ALL_CDROMS} ]]	if [[ ! -z ${ALL_CDROMS} ]]
165	then	then
166	echo " \n \\" >> ${hwtmp}	message+="\n"
167	echo " CDROM Laufwerke:\n \\" >> ${hwtmp}	message+=$"Optical disk drives:\n"
168	for i in ${ALL_CDROMS}	for i in ${ALL_CDROMS}
169	do	do
170	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn"
171	done	done
172		message+="\n"
173	fi	fi
174
175	# other devices	# other devices
176	run_hardware_detection	run_hardware_detection
177	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
178	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;	zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
179	rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;	rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
180	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;	maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
181	*) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;	*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
182	esac	esac
183	if [[ ${FORMFACTOR} = laptop ]]	if [[ ${FORMFACTOR} = laptop ]]
184	then	then
185	echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}	message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
186	fi	fi
187
188	echo " \" 14 70" >> ${hwtmp}	messagebox -y 15 -h $"Detected hardware:" "${message}"
	chmod a+x ${hwtmp}
	${hwtmp}
	# remove tmp file
	if [[ -f ${hwtmp} ]]
	then
	rm ${hwtmp}
	fi
189	}	}
190
191	dialog_setup_hdd_partitions_manuell()	dialog_setup_hdd_partitions_manual()
192	{	{
193	local i	local i
194
195	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
196	then	then
197	dialog \	dialog \
198	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 259  dialog_setup_hdd_partitions_manuell()	Line 208  dialog_setup_hdd_partitions_manuell()
208	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
209	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
210
211	for i in ${installdevs}	for i in ${ALL_DISKS}
212	do	do
213	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
214	done	done
#	Line 272  dialog_setup_hdd_partitions_manuell()	Line 221  dialog_setup_hdd_partitions_manuell()
221	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
222	then	then
223	dialog_setup_hdd_info	dialog_setup_hdd_info
224	setup_hdd_partitions_manuell	setup_hdd_partitions_manual
	fi
	fi
	}
	dialog_setup_hdd_partitions_manuell_flash()
	{
	local i
	if [[ -z ${installdevs} ]]
	then
	dialog \
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
	exit 1
	else
	echo "dialog \\" > /tmp/hddtmp.sh
	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
	echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
	echo "--stdout \\" >> /tmp/hddtmp.sh
	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
	for i in ${installdevs}
	do
	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
	done
	echo -e "\n" >> /tmp/hddtmp.sh
	chmod a+x /tmp/hddtmp.sh
	HDD="$(/tmp/hddtmp.sh)"
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
	then
	dialog_setup_hdd_info_flash
	setup_hdd_partitions_manuell_flash
225	fi	fi
226	fi	fi
227	}	}
#	Line 319  dialog_setup_hdd_partitions_auto()	Line 230  dialog_setup_hdd_partitions_auto()
230	{	{
231	local i	local i
232
233	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
234	then	then
235	dialog \	dialog \
236	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 335  dialog_setup_hdd_partitions_auto()	Line 246  dialog_setup_hdd_partitions_auto()
246	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
247	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
248
249	for i in ${installdevs}	for i in ${ALL_DISKS}
250	do	do
251	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
252	done	done
#	Line 606  EOF	Line 517  EOF
517	fi	fi
518	}	}
519
520	setup_hdd_partitions_manuell()	setup_hdd_partitions_manual()
	{
	BOOTHDD="${HDD}1"
	SWAPHDD="${HDD}2"
	ROOTHDD="${HDD}3"
	## hdds partitionieren manuell
	cfdisk ${HDD} || dialog_die
	}
	setup_hdd_partitions_manuell_flash()
521	{	{
522	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
523
524	## hdds partitionieren manuell	## hdds partitionieren manual
525	cfdisk ${HDD} || dialog_die	cfdisk ${HDD} || dialog_die
526	}	}
527
528	setup_hdd_format()	setup_hdd_format()
529	{	{
	mkswap ${SWAPHDD} || dialog_die
	mke2fs -j -q ${BOOTHDD} || dialog_die
	mke2fs -j -q ${ROOTHDD} || dialog_die
	}
	setup_hdd_format_flash()
	{
530	mke2fs -j -q ${ROOTHDD} || dialog_die	mke2fs -j -q ${ROOTHDD} || dialog_die
531	}	}
532
533	install_mount_rootfs()	install_mount_rootfs()
534	{	{
	swapon ${SWAPHDD} || dialog_die
	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
	install -d ${INSTALLROOT}/boot || dialog_die
	mount ${BOOTHDD} ${INSTALLROOT}/boot || dialog_die
	cd ${INSTALLROOT} || dialog_die
	}
	install_mount_rootfs_flash()
	{
535	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
536	install -d ${INSTALLROOT}/boot || dialog_die	install -d ${INSTALLROOT}/boot || dialog_die
537	cd ${INSTALLROOT} || dialog_die	cd ${INSTALLROOT} || dialog_die
#	Line 831  CHROOTEOF	Line 716  CHROOTEOF
716
717	is_uuid_supported()	is_uuid_supported()
718	{	{
719	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]	if [[ -x $(type -P busybox.mkinitrd) ]]
720	then	then
721	# only detect uuids if supported	# only detect uuids if supported
722	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
#	Line 867  install_system_settings()	Line 752  install_system_settings()
752	# schreibe fstab	# schreibe fstab
753	if is_uuid_supported	if is_uuid_supported
754	then	then
	echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
755	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
756	else	else
	echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
757	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
758	fi	fi
759	# not needed busybox loads all with swapon -a, even if not mentioned in fstab	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
#	Line 895  install_system_settings()	Line 778  install_system_settings()
778	fi	fi
779	}	}
780
	install_system_settings_flash()
	{
	# schreibe fstab
	if is_uuid_supported
	then
	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
	else
	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
	fi
	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
	}
781	install_umount_rootfs()	install_umount_rootfs()
782	{	{
783	cd /	cd /
784	umount ${INSTALLROOT}/boot || dialog_die	umount ${INSTALLROOT}/boot || dialog_die
785	umount ${INSTALLROOT} || dialog_die	umount ${INSTALLROOT} || dialog_die
	swapoff ${SWAPHDD} || dialog_die
	}
	install_umount_rootfs_flash()
	{
	cd /
	umount ${INSTALLROOT} || dialog_die
786	}	}
787
788	install_do_reboot()	install_do_reboot()
#	Line 935  run_install_normal()	Line 798  run_install_normal()
798	{	{
799	dialog_hardware_detection	dialog_hardware_detection
800
801	dialog_setup_hdd_partitions_manuell	dialog_setup_hdd_partitions_manual
802	dialog_setup_hdd_format	dialog_setup_hdd_format
803	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
804	install_mount_rootfs	install_mount_rootfs
#	Line 953  run_install_normal()	Line 816  run_install_normal()
816	dialog_install_successful	dialog_install_successful
817	}	}
818
	run_install_flash()
	{
	dialog_hardware_detection
	dialog_setup_hdd_partitions_manuell_flash
	dialog_setup_hdd_format
	setup_hdd_format_flash > /dev/null
	install_mount_rootfs_flash
	(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_initrd_chroot
	dialog_install_bootsector
	install_bootsector_chroot
	install_umount_rootfs_flash
	dialog_install_successful
	}
819	run_install_auto()	run_install_auto()
820	{	{
821	dialog_hardware_detection	dialog_hardware_detection
822
823	dialog_setup_hdd_partitions_auto	dialog_setup_hdd_partitions_auto
824	dialog_setup_hdd_format	dialog_setup_hdd_format
825	setup_hdd_format_flash > /dev/null	setup_hdd_format > /dev/null
826	install_mount_rootfs_flash	install_mount_rootfs
827	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
828
829	dialog_install_settings	dialog_install_settings
830	sleep 1	sleep 1
831	install_system_settings_flash	install_system_settings
832	install_initrd_chroot	install_initrd_chroot
833
834	dialog_install_bootsector	dialog_install_bootsector
835	install_bootsector_chroot	install_bootsector_chroot
836
837	install_umount_rootfs_flash	install_umount_rootfs
838	dialog_install_successful	dialog_install_successful
839	}	}
840
841		# set some proper traps
842		trap "trap_exit" SIGINT SIGQUIT
843
844	dialog_main	dialog_main
845
846	exit 0	exit 0

---

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

Legend: Removed from v.2344   changed lines   Added in v.2419