summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
l---------remote/targets/stage3.2-opensuse/consolekit1
-rwxr-xr-xserver/export_target15
2 files changed, 9 insertions, 7 deletions
diff --git a/remote/targets/stage3.2-opensuse/consolekit b/remote/targets/stage3.2-opensuse/consolekit
new file mode 120000
index 00000000..261968c7
--- /dev/null
+++ b/remote/targets/stage3.2-opensuse/consolekit
@@ -0,0 +1 @@
+../../modules/consolekit \ No newline at end of file
diff --git a/server/export_target b/server/export_target
index 587804d9..6ce5838c 100755
--- a/server/export_target
+++ b/server/export_target
@@ -19,9 +19,12 @@ MODE_DIR="${ROOT_DIR}/server"
#files generated by this script land in boot
SERVER_BOOT_DIR="${MODE_DIR}/boot"
+# TODO: Obviously this needs to be a param to script
+REMOTE_IP="132.230.102.104"
+
#builds from remote server
-SERVER_BUILD_DIR="${MODE_DIR}/remote_builds"
-REMOTE_BUILD_DIR="${ROOT_DIR}/remote/builds"
+SERVER_BUILD_DIR="${MODE_DIR}/local_builds/${REMOTE_IP}"
+#REMOTE_BUILD_DIR="${MODE_DIR}/remote_builds"
#stage32 sqfs directory
STAGE32_SQFS_DIR="${SERVER_BOOT_DIR}/stage32_sqfs/mnt"
@@ -45,11 +48,9 @@ sync_remote() {
pinfo "Synching 'remote/builds' to 'server/remote_builds'..."
#TODO setup link to remote build directory, later this directory will be rsynced or exported to this server...
- if [ ! -d "${SERVER_BUILD_DIR}" ]; then
- [ ! -d "${REMOTE_BUILD_DIR}" ] && perror "remote 'builds' directory not found, exiting."
- ln -s "${REMOTE_BUILD_DIR}" "${SERVER_BUILD_DIR}"
- fi
-
+
+ mkdir -p "${SERVER_BUILD_DIR}" || perror "Could not create directory for local copy of remote system ($SERVER_BUILD_DIR)"
+ rsync -a -v -e "ssh -oStrictHostKeyChecking=no" "root@$REMOTE_IP:/export/build" "$SERVER_BUILD_DIR" || perror "rsync from 'root@$REMOTE_IP:/export/build' to '$SERVER_BUILD_DIR' failed."
}
generate_stage32() {