Модифицирован init.d/calculate

Запуск настройки выполняется только при первой загрузки: перезапуски
демона игнорируются. Добавлен вызов cl-core, который должен удалить
сертификаты пользователей.

data/calculate

@@ -135,40 +135,45 @@ setup_alsautils() {
 }
 
 start() {
-	local rootflash=`variable_value main.os_root_flash_dev`
 	local roottype=`variable_value main.os_root_type`
-	if [[ $roottype != "livecd" ]] || grep -e "video:nvidia" -e "video:fglrx" /proc/cmdline &>/dev/null
+	if rc-config list boot | grep -q -e "calculate " -e "calculate$"
 	then
-		install_video_driver
-	fi
-	setup_alsautils
-	LANG=C create_nonroot_user
-	LANG=C /usr/sbin/cl-core --method setup_system --no-progress --usenew-conf --live on
-	LANG=C configure_users
-	[[ -n $rootflash ]] && mount -o remount,rw $rootflash
-
-	# reinit net.* services
-	local rootdev=`variable_value main.os_root_dev`
-	if [[ $roottype == "livecd" ]] && [[ $rootdev == "/dev/nfs" ]]
-	then
-		touch /* /bin/* /sbin/*
-		udevadm trigger --action="add" --subsystem-match=net
-	fi
+		local rootflash=`variable_value main.os_root_flash_dev`
+		if [[ $roottype != "livecd" ]] || grep "video:nvidia" /proc/cmdline &>/dev/null
+		then
+			install_video_driver
+		fi
+		setup_alsautils
+		LANG=C create_nonroot_user
+		LANG=C /usr/sbin/cl-core --method setup_system --no-progress --usenew-conf --live on
+		LANG=C configure_users
+		[[ -n $rootflash ]] && mount -o remount,rw $rootflash
+
+		# reinit net.* services
+		local rootdev=`variable_value main.os_root_dev`
+		if [[ $roottype == "livecd" ]] && [[ $rootdev == "/dev/nfs" ]]
+		then
+			touch /* /bin/* /sbin/*
+			udevadm trigger --action="add" --subsystem-match=net
+		fi
 
-	/sbin/rc-update --update
+		/sbin/rc-update --update
 
-	local roottype=`variable_value main.os_root_type`
-	if [[ $roottype == "hdd" ]] && rc-config list boot | grep -q -e "calculate " -e "calculate$"
-	then
 		rc-update del calculate boot
-		local distdir="/usr/portage/distfiles"
-		local pkgdir="/usr/portage/packages"
-		local video_script="/usr/local/sbin/cl-video-install"
-		local cache_video="/var/cache/calculate/video_drivers"
-		[[ -d "${distdir}" ]] && [[ -n "`ls ${distdir}`" ]] && rm ${distdir}/*
-		[[ -d "${pkgdir}" ]] && [[ -n "`ls ${pkgdir}`" ]] && rm -r ${pkgdir}/*
-		[[ -f "${video_script}" ]] && rm -f "${video_script}"
-		[[ -f "${cache_video}" ]] && rm -f "${cache_video}"
+		if [[ $roottype == "hdd" ]]
+		then
+			/usr/sbin/cl-core --clear-local-cert
+			local distdir="/usr/portage/distfiles"
+			local pkgdir="/usr/portage/packages"
+			local video_script="/usr/local/sbin/cl-video-install"
+			local cache_video="/var/cache/calculate/video_drivers"
+			[[ -d "${distdir}" ]] && [[ -n "`ls ${distdir}`" ]] && rm ${distdir}/*
+			[[ -d "${pkgdir}" ]] && [[ -n "`ls ${pkgdir}`" ]] && rm -r ${pkgdir}/*
+			[[ -f "${video_script}" ]] && rm -f "${video_script}"
+			[[ -f "${cache_video}" ]] && rm -f "${cache_video}"
+		fi
+	else
+		ewarn "System already configured!"
 	fi
 
 	return 0