Merge branch 'master' of movie:calculate

install/builder/kernel/config?system=desktop&march=i686

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.31-gentoo-r6
-# Mon Nov 23 15:45:34 2009
+# Wed Nov 25 13:50:06 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -97,8 +97,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_USER_SCHED=y
 # CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set

install/calculate

@@ -663,7 +663,6 @@ sub checkerrors{
 	#----------------------------------------------------------------------
 	$data{data_install_set} = "";
 	$data{partitions_dev} = "";
-	$data{partitions_fdisk} = "";
 	if($data{arg}{'disk'}){
 		if($data{arg}{'disk'}!~m/^(\/dev\/)/ || !-e $data{arg}{'disk'}){
 			printmes(gettext('Incorrect partition'));
@@ -2207,7 +2206,8 @@ sub checksystem{
 	#----------------------------------------------------------------------
 	# Установим $data{partitions_fdisk}
 	#----------------------------------------------------------------------
-	{
+	 $data{partitions_fdisk} = "";
+	if($data{data_install_set}){
 		my $acl; if($data{'format'} ne 'xfs'){$acl = "acl,";}
 		$data{partitions_fdisk} =
 			" /var/calculate auto ${acl}noatime 0 0\n".