X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Finstall-2;h=6f7cf5fe4636913bcc9762ea9f35c8d721c5436a;hb=b7d1d99f41dcf50a8635f608679947f4455a0c7c;hp=34c3d45ab4d20b9ea158528a396a3f8333f07f59;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage2/install-2 b/stage2/install-2
index 34c3d45..6f7cf5f 100755
--- a/stage2/install-2
+++ b/stage2/install-2
@@ -1,22 +1,12 @@
 #!/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 ${GDBM}
 ipkg ${INETUTILS}
 ipkg -m noac ${BZIP2}
@@ -40,37 +30,34 @@ ipkg ${MAN_DB} "\
 ipkg ${MODULE_INIT_TOOLS}
 ipkg ${PATCH_PACKAGE}
 ipkg ${PSMISC}
-ipkg -m noac ${SHADOW}
-ipkg ${SYSKLOGD}
-ipkg ${SYSVINIT}
+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}
+ipkg ${NANO}
+
+rscr once "Installing HV-utilities" install-hv-utilities
+rscr once "Installing bootscripts"  install-bootscripts
+rscr once "Creating default config files" create-config-files
 
-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" 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