X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Finstall-2;h=dd21aaebba9c188d60fa3aa424712b9692a4613d;hb=7f1a3e5d69d0b1d64619604c30243e0070dc09ad;hp=debabd77c2e49d4980e8b1adf6f8ad58cde90495;hpb=d9a5344c1aa683d051d1a1d5e87f0bba317e299a;p=hvlinux.git

diff --git a/stage2/install-2 b/stage2/install-2
index debabd7..dd21aae 100755
--- a/stage2/install-2
+++ b/stage2/install-2
@@ -1,88 +1,60 @@
 #!/bin/bash
 
-LFS_STAGE=stage2
-
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
-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
-
 init_log_file
 
-# Scripts directory
-export SCRDIR=$(pwd)
-
-ipkg_ac    ${LIBTOOL}
-ipkg_cust  ${GDBM} cis-gdbm
-ipkg_cust  ${INETUTILS} cis-inetutils \
-    --libexecdir=/usr/sbin \
-    --localstatedir=/var \
-    --disable-ifconfig \
-    --disable-logger \
-    --disable-syslogd \
-    --disable-whois \
-    --disable-servers
-ipkg_cust  ${PERL} cis-perl-pass2
-ipkg_ac    ${AUTOCONF}
-ipkg_ac    ${AUTOMAKE}
-ipkg_cust  ${BZIP2} cis-bzip2
-ipkg_cust  ${DIFFUTILS} cis-diffutils
-ipkg_ac    ${FILE_PKG}
-ipkg_ac    ${GAWK} "--libexecdir=/usr/lib"
-ipkg_cust  ${FINDUTILS} cis-findutils
-ipkg_cust  ${FLEX} cis-flex
-ipkg_ac    ${GETTEXT}
-ipkg_cust  ${GROFF} cis-groff
-ipkg_cust  ${GZIP} cis-gzip
-ipkg_cust  ${IPROUTE2} cis-iproute2
-ipkg_cust  ${KBD} cis-kbd
-ipkg_ac    ${LESS}
-ipkg_ac    ${MAKE_PACKAGE}
-ipkg_ac    ${MAN_DB} \
+ipkg ${GDBM}
+ipkg ${INETUTILS}
+ipkg -m noac ${BZIP2}
+ipkg ${DIFFUTILS}
+ipkg ${FILE_PKG}
+ipkg ${GAWK} "--libexecdir=/usr/lib"
+ipkg ${FINDUTILS}
+ipkg ${GETTEXT}
+ipkg ${GREP} "--bindir=/bin --without-included-regex"
+ipkg ${GROFF}
+ipkg ${GZIP}
+ipkg ${KBD}
+ipkg ${LESS}
+ipkg ${MAKE_PACKAGE}
+ipkg ${MAN_DB} "\
     --libexecdir=/usr/lib \
     --disable-setuid \
     --with-browser=/usr/bin/lynx \
     --with-vgrind=/usr/bin/vgrind \
-    --with-grap=/usr/bin/grap
-ipkg_cust  ${MODULE_INIT_TOOLS} cis-module-init-tools
-ipkg_ac    ${PATCH_PACKAGE}
-ipkg_cust  ${PSMISC} cis-psmisc
-ipkg_cust  ${SHADOW} cis-shadow
-ipkg_cust  ${SYSKLOGD} cis-sysklogd
-ipkg_cust  ${SYSVINIT} cis-sysvinit
-ipkg_ac    ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
-ipkg_cust  ${TEXINFO} cis-texinfo
-ipkg_cust  ${UDEV} cis-udev
-ipkg_cust  ${UDEV_CONFIG} cis-udev-config
-#ipkg_cust  ${GRUB} cis-grub
-
-rscr once  "Installing HV-utilities" cis-hv-utilities
-rscr mult  "Compressing man pages"   cis-compressdoc
-rscr once  "Installing bootscripts"  cis-bootscripts
-#rscr mult "Stripping" cis-stripping
+    --with-grap=/usr/bin/grap"
+ipkg ${MODULE_INIT_TOOLS}
+ipkg ${PATCH_PACKAGE}
+ipkg ${PSMISC}
+ipkg ${SHADOW}
+ipkg -m noac ${SYSKLOGD}
+ipkg -m noac ${SYSVINIT}
+ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
+ipkg ${TEXINFO}
+ipkg ${UDEV}
+ipkg -m noac ${UDEV_CONFIG}
+ipkg ${GRUB}
+ipkg -m acnb ${DHCP}
+
+rscr once  "Installing HV-utilities" install-hv-utilities
+rscr mult  "Compressing man pages"   compressdoc
+rscr once  "Installing bootscripts"  install-bootscripts
+#rscr mult "Stripping" stripping
 
 echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
 
 # Creating root password
-passwd root || exit 1
+passwd root
 
-rscr mult  "Performing post-install" cis-post-install
+rscr mult  "Performing post-install" post-install
 ldconfig
 
-lasterror=$?
-
-if [ ${lasterror} -eq 0 ]; then
-    echo "Stage2 successfully completed."
-    echo "You must now compile a new kernel (go to /usr/src/linux)."
-    echo "After that, you can reboot and try your new system."
-else
-    echo "Error in script 'install-2'"
-    exit ${lasterror}
-fi
+echo "Stage2 successfully completed."
+echo "You must now compile a new kernel (go to /usr/src/linux)."
+echo "After that, you can reboot and try your new system."
 
 exec /bin/bash --login