X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=c63ea980dd0e9c7d40422fc2ba4753aeb92f950a;hb=4a38ddab8f1bc13cc13dbf15bb36454dffa8c1cb;hp=494716b5333b52410faff5aa1d027243e61d6d70;hpb=f920c7ef750f2163b9e407cc453b192ede2c185a;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 494716b..c63ea98 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -1,16 +1,10 @@
-#!/bin/sh
-
-LFS_STAGE=stage5
-
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE}
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP=/tmp
+#!/bin/bash
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
-source ../packages-list
+hvtrap_setup
+source ../config/packages-list
 source /etc/profile
 
 if [ "x${USER}" != "xroot" ]; then
@@ -197,10 +191,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_cust ${MILTER_GREYLIST} cis-milter-greylist
 fi
 
-# fcron needs sendmail installed.
-ipkg_cust ${FCRON}   cis-fcron
-ipkg_cust ${GETDATE} cis-getdate
-
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_cust ${CLAMAV}       cis-clamav
 
@@ -228,7 +218,7 @@ PERL_MOD_IO_COMPRESS_BASE="IO-Compress-Base-2.024"
 PERL_MOD_IO_COMPRESS_ZLIB="IO-Compress-Zlib-2.024"
 PERL_MOD_COMPRESS_RAW_ZLIB="Compress-Raw-Zlib-2.024"
 
-    ipkg_cust ${SPAMASSASSIN} cis-spamassassin
+    ipkg -m pm ${SPAMASSASSIN}
     ipkg_cust ${UW_IMAP}      cis-uw-imap
 
     # Apache
@@ -236,7 +226,6 @@ PERL_MOD_COMPRESS_RAW_ZLIB="Compress-Raw-Zlib-2.024"
     ipkg_cust ${PHP}   cis-php
 
     ipkg_cust ${SQUIRRELMAIL} cis-squirrelmail
-    ipkg_cust ${MAILMAN} cis-mailman
     ipkg_ac   ${FETCHMAIL} "--with-ssl"
     ipkg_ac   ${MUTT} "--enable-imap --with-ssl"