X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=9e4fc4dd9151ec664e4bcd24798d245726c30d71;hb=6890ab467c34bc0ae1fccf18a521c3cedfa442a2;hp=b92bf2688913d2fbc44346d51dd013495f55ba9d;hpb=59a2acf7509c2ddf54b9cf62eced739b11541ed9;p=hvlinux.git

diff --git a/functions/main b/functions/main
index b92bf26..9e4fc4d 100644
--- a/functions/main
+++ b/functions/main
@@ -2,8 +2,8 @@
 set -o errtrace # Let shell functions inherit ERR trap.
 set -o errexit
 
-# Don' t locate and remember (hash) commands as they are looked up for
-# execution (don' t remember path):
+# Don't locate and remember (hash) commands as they are looked up for
+# execution (don't remember path):
 set +h
 
 hvtrap_setup()
@@ -118,18 +118,26 @@ test_presence_of_packages_directory()
 }
 
 # Create log directory and log file for current stage if necessary
-# This should be done automatically...
-init_log_file()
+# Arg #1: log file name
+static_init_log_file()
 {
+    # Checking for correct number of arguments
+    if [ $# -ne 1 ]; then
+	echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+	return 1
+    fi
+
+    local LOG_FILE_NAME=${1}
+
     # Scripts directory
     export SCRDIR=$(pwd)
 
     test_presence_of_packages_directory
 
-    export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-    export LFS_PATCHES_DIR="${SCRDIR}/patches"
+    export LFS_PKG_BASE="$(dirname $(pwd))/packages"
+    export LFS_PKG_DIR="${LFS_PKG_BASE}/${LFS_STAGE}"
     export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
-    export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
+    export LFS_LOG_FILE=${LFS_LOG_DIR}/${LOG_FILE_NAME}
     export LFS_TMP="${LFS}/tmp"
 
     mkdir -p ${LFS_LOG_DIR} &&
@@ -138,6 +146,20 @@ init_log_file()
     fi
 }
 
+# Create log directory and install log file for current stage if necessary
+init_log_file()
+{
+    static_init_log_file "install.log"
+    export LFS_PATCHES_DIR="${SCRDIR}/patches"
+}
+
+# Create log directory and update log file for current stage if necessary
+init_log_file_update()
+{
+    static_init_log_file "pkg-update.log"
+    export LFS_PATCHES_DIR="${LFS_PKG_DIR}/patches"
+}
+
 # Check that we are logged in as the root user, and exit if this is not the case.
 check_for_root_user()
 {