From 2a991852ade4de5ab6ea355a1f2996edb106d08d Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Sun, 2 Oct 2011 20:40:00 +0200
Subject: fix estimated min size when using gfxoverlay

---
 backend/modules/hdmap   | 10 ----------
 backend/modules/init    |  3 +++
 backend/modules/install |  1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/backend/modules/hdmap b/backend/modules/hdmap
index ea98dd1..7be2818 100644
--- a/backend/modules/hdmap
+++ b/backend/modules/hdmap
@@ -30,16 +30,6 @@ function is_disk()
     return 1
 }
 
-# Synopsis: calculate_min_space
-#
-# This function estimates the minimum space needed for a hdinstall
-function calculate_min_space()
-{
-    ESTIMATED_ROOT_MIN=$(df -m "/live/filesystem" | tail -1 | gawk '{print $3}')
-    grep -q squashfs /proc/mounts && ESTIMATED_ROOT_MIN=$(($ESTIMATED_ROOT_MIN*270/100))
-    export ESTIMATED_ROOT_MIN
-}
-
 # Synopsis: handle_mountpoint_demands <device>
 #
 # This function handles the demands of the mountpoints (data from function mountpoint_demands)
diff --git a/backend/modules/init b/backend/modules/init
index c93cb27..073698e 100644
--- a/backend/modules/init
+++ b/backend/modules/init
@@ -25,6 +25,9 @@ function init_installer()
 	if [ ! -d /live/filesystem/usr ]; then
 		[ "$LOOPDEV" ] && mount -o ro "$LOOPDEV" /live/filesystem
 	fi
+        ESTIMATED_ROOT_MIN=$(df -m "$LOOPDEV" | tail -1 | gawk '{print $3}')
+        grep -q squashfs /proc/mounts && ESTIMATED_ROOT_MIN=$(($ESTIMATED_ROOT_MIN*270/100))
+        export ESTIMATED_ROOT_MIN
 	cfg_set hostname "${FLL_DISTRO_NAME}Box"
 }
 
diff --git a/backend/modules/install b/backend/modules/install
index 760f40d..fc400da 100644
--- a/backend/modules/install
+++ b/backend/modules/install
@@ -44,7 +44,6 @@ function copy_system_to_target()
 {
 	send install_step copy_system_to_target
 	emit_progress 0
-	calculate_min_space
 	orig_size="$ESTIMATED_ROOT_MIN"
 	dest_size_before=$(di -dm -fSMu | gawk '/\/live\/hdinstall/{used+=int($3)} END{print int(used)}')
 	dest_size_diff=0
-- 
cgit v1.0