From 99d3b01af539881a92ff4ae8a1fda0dbfc7cfaa7 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 7 Jan 2009 21:25:11 -0600
Subject: Remove writing boot sector from the progress log. Also stop the
 Progress dialog from ever reaching 100% complete. closes FS#78

---
 abs/core-testing/LinHES-config/PKGBUILD         |  2 +-
 abs/core-testing/LinHES-config/install_proxy.sh | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index c0eaf2b..44cb38a 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=149
+pkgrel=152
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh
index 8462e9c..e29417e 100755
--- a/abs/core-testing/LinHES-config/install_proxy.sh
+++ b/abs/core-testing/LinHES-config/install_proxy.sh
@@ -124,14 +124,15 @@ full_install () {
         $run copy_it $disk ALL
         rm $mountpoint/etc/fstab
         $run fstab_fix_it $disk $rootfs $datafs FULL_INSTALL
-
-    progress 99
+ echo "Configuring system" > /tmp/.install_state
+        progress 100
+    #progress 99
     sleep 1
     $run grub_it $disk
 
 
-    echo "Configuring system" > /tmp/.install_state
-        progress 100
+        #echo "Configuring system" > /tmp/.install_state
+        #progress 100
         sleep 1
         cp_and_log  /etc/systemconfig "$mountpoint"/etc
         #run save syssettings to save settings, then copy to new mountpoint
@@ -264,13 +265,14 @@ function upgrade () {
 
 	    #this is here to copy in the systemconfig file as soon as possible.
         cp_and_log  /etc/systemconfig "$mountpoint"/etc/systemconfig
-
-        echo "Writing boot sector" > /tmp/.install_state
-        progress 99
+        echo "Configuring system" > /tmp/.install_state
+        progress 100
+        #echo "Writing boot sector" > /tmp/.install_state
+        #progress 99
         sleep 1
         $run grub_it $disk
-        echo "Configuring system" > /tmp/.install_state
-        progress
+        #echo "Configuring system" > /tmp/.install_state
+        #progress 100
         sleep 1
         cp_and_log /etc/mtab "$mountpoint"/etc/mtab
         cp_and_log  /etc/systemconfig "$mountpoint"/etc
@@ -602,10 +604,10 @@ echo "-----------------------------------------------------------------------3--
                     total=$TOTALSIZE
                 fi
             percent=`echo "scale=2 ;  ($used/$total) * 100 " |bc `
-            cond2=$(echo "$percent > 100" |bc  )
+            cond2=$(echo "$percent > 98" |bc  )
             if [ $cond2 -eq 1  ]
             then
-            percent=100
+            percent=98
             fi
             cond3=$(echo "$percent < 3" |bc )
             if [ $cond3 -eq 0   ]
-- 
cgit v0.12

