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

Parent Directory | Revision Log | Patch

	revision 2430 by niro, Tue Jan 7 14:14:23 2014 UTC	revision 2434 by niro, Tue Jan 7 14:20:31 2014 UTC
#	Line 293  run_hardware_detection()	Line 293  run_hardware_detection()
293	#removable=1	#removable=1
294	#fi	#fi
295	#done	#done
296		## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
297
298	## only add this for grub legacy, grub2 detect these settings on its own	## only add this for grub legacy, grub2 detect these settings on its own
299	#export GRUBLEGACYOPTS="rootdelay=8"	#export GRUBLEGACYOPTS="rootdelay=8"
#	Line 437  setup_hdd_partitions_manual()	Line 438  setup_hdd_partitions_manual()
438
439	setup_hdd_format()	setup_hdd_format()
440	{	{
441	mke2fs -j -q ${ROOTHDD} || dialog_die	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
442	}	}
443
444	install_mount_rootfs()	install_mount_rootfs()
445	{	{
446	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
447	install -d ${INSTALLROOT}/boot || dialog_die	install -d ${INSTALLROOT}/boot || dialog_die
	cd ${INSTALLROOT} || dialog_die
448	}	}
449
450	install_system_image()	install_system_image()
451	{	{
452		pushd ${INSTALLROOT} > /dev/null
453	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
454		popd > /dev/null
455	}	}
456
457	install_bootsector_chroot()	install_bootsector_chroot()
#	Line 690  install_system_settings()	Line 692  install_system_settings()
692
693	install_umount_rootfs()	install_umount_rootfs()
694	{	{
	cd /
695	umount ${INSTALLROOT}/boot || dialog_die	umount ${INSTALLROOT}/boot || dialog_die
696	umount ${INSTALLROOT} || dialog_die	umount ${INSTALLROOT} || dialog_die
697	}	}

---

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

Legend: Removed from v.2430   changed lines   Added in v.2434