Updated scripts (create directories, do not install weak dependencies).

diff --git a/scripts/c3.sh b/scripts/c3.sh
index 8b8c6a1a8fac0ef6473368ff91bf428a291a178d..0bbc2149272dccbe1c6f4b95d1cba39993d95335 100755 (executable)
--- a/scripts/c3.sh
+++ b/scripts/c3.sh
@@ -154,7 +154,7 @@ copy_and_install()
     echo "Copied files and installed packages."
 }
 
-create_build_path()
+create_and_populate_build_path()
 {
     echo "Creating and populating the container build directory."
 
@@ -173,6 +173,17 @@ create_build_path()
     echo "Created and populated the container build directory."
 }
 
+create_base_paths()
+{
+    echo "Creating container base directories."
+
+    [ ! -d $BACKUPS_PATH ] && mkdir --parents $BACKUPS_PATH
+    [ ! -d $BUILD_PATH ] && mkdir --parents $BUILD_PATH
+    [ ! -d $LXC_PATH ] && mkdir --parents $LXC_PATH
+
+    echo "Created container base directories."
+}
+
 create_environment_file()
 {
     ENV_FILE=$(mktemp)
@@ -498,9 +509,11 @@ fi
 
 echo "Starting at $(date)"
 
+create_base_paths
+
 create_environment_file
 
-create_build_path
+create_and_populate_build_path
 
 populate_c3d
 

diff --git a/scripts/create-base.sh b/scripts/create-base.sh
index 6764ccd890bdee12713eac25240a325c02e9e55a..07999e6da19744efbd5aa6dcbd3dc566cd6817b4 100755 (executable)
--- a/scripts/create-base.sh
+++ b/scripts/create-base.sh
@@ -34,7 +34,7 @@ backup_old_container()
         "RUNNING")
             echo "Stopping (the old) container $OLD_CONTAINER_NAME"
             lxc-stop --name=$OLD_CONTAINER_NAME
-           echo "Stopped (the old) container $OLD_CONTAINER_NAME"
+            echo "Stopped (the old) container $OLD_CONTAINER_NAME"
             ;;
         "STOPPED")
             ;;

diff --git a/scripts/dnf.conf.fedora b/scripts/dnf.conf.fedora
index a9d341acba7553d029571df8265435d12909a4ef..7b822c99fc12e529efd97969bbec1af36b030ab1 100644 (file)
--- a/scripts/dnf.conf.fedora
+++ b/scripts/dnf.conf.fedora
@@ -1,5 +1,6 @@
 [main]
 deltarpm=False
+install_weak_deps=False
 
 [local-fedora]
 name=Fedora $releasever - $basearch