diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-01-11 18:50:00 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-01-11 18:50:00 (GMT) |
| commit | 3f11fa374c89a6444e75e7ae319a41cefd8d51ab (patch) | |
| tree | b46a5e6f3d6cc46f376116f70794da4ca5b1038d /abs/core-testing/LinHES-config | |
| parent | bcf5ec3fa5da5bbac9a1eaba782bbcea0278d9b7 (diff) | |
| parent | ae4a3db9403d07e987efc351701eb5429baff635 (diff) | |
| download | linhes_pkgbuild-3f11fa374c89a6444e75e7ae319a41cefd8d51ab.zip linhes_pkgbuild-3f11fa374c89a6444e75e7ae319a41cefd8d51ab.tar.gz linhes_pkgbuild-3f11fa374c89a6444e75e7ae319a41cefd8d51ab.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config')
| -rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/install_proxy.sh | 27 |
2 files changed, 16 insertions, 13 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index ef555bc..aac97cc 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=151 +pkgrel=154 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..670238b 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 @@ -260,17 +261,19 @@ function upgrade () { then rootfs=`grep \/\ /tmp/etc/fstab |awk ' { print $3 } '` fi + #this is here to copy in the systemconfig file as soon as possible. + cp_and_log /etc/systemconfig "$mountpoint"/etc/systemconfig + echo "Configuring system" > /tmp/.install_state + progress 100 $run fstab_fix_it $disk 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 "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 +605,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 ] |