Merge branche make

[hvlinux.git] / stage2 / post-install

diff --git a/stage2/post-install b/stage2/post-install
index f0f33e0..fba81f2 100755 (executable)
--- a/stage2/post-install
+++ b/stage2/post-install
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
-source ../packages-list
+source ../config/packages-list
 
 cat > /etc/default/useradd << "EOF"
 # useradd defaults file
@@ -37,7 +37,12 @@ sed -i -e "s!^\(PATH=\).*tools.*!\1${SED_REP}!" /etc/profile
 
 # Removing /tools directory
 if [ -d /tools ]; then
-    mv /tools /tools.to.remove.after.stage2
+    DEST=/usr/src/tools
+    if [ -d ${DEST} ]; then
+        # Remove old backup
+        rm -rf ${DEST}
+    fi
+    mv /tools ${DEST}
 fi
 
 ldconfig