From fb1e326df30daa27f8df8602fead52c607a12bea Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 29 Jan 2014 17:38:36 +0100
Subject: <clone_stage4> don't exclude stage32 anymore, aufs stacking order
 should take care of it

---
 scripts/clone_stage4 | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'scripts/clone_stage4')

diff --git a/scripts/clone_stage4 b/scripts/clone_stage4
index 9691c609..339d9eea 100755
--- a/scripts/clone_stage4
+++ b/scripts/clone_stage4
@@ -21,11 +21,7 @@ qnd_exit() {
 [ $# -lt 3 ]		&& perror "$0 <remote_ip> <stage_to_exclude> <target_dir>"
 [ "$1" = "local" ]	&& perror 'It is not wise to use "local" as remote IP.'
 
-BASE_DIR="${ROOT_DIR}/server/local_builds/$1"
 BOOT_DIR="${ROOT_DIR}/server/boot/$1"
-[ ! -d "$BASE_DIR" ] && perror "Unknown Vorlage '$1'"
-BASE_DIR="${BASE_DIR}/$2"
-[ ! -d "$BASE_DIR" ] && perror "Unknown Stage '$2' for Vorlage '$1'"
 TARGET_DIR="$3"
 mkdir -p "$TARGET_DIR"
 mkdir -p "$BOOT_DIR"
@@ -43,14 +39,6 @@ for FILE in $(find "$ROOT_DIR"/server/blacklists/*/ -type f); do
 	grep '^+' "$FILE" >> "$INCLUDE"
 done
 
-echo "## From cloned $2 of $1" >> "$EXCLUDE"
-# this next command lists all files found in BASE_DIR and removes the prefix BASE_DIR
-IFS=$'\n'
-for FILE in $(find "${BASE_DIR}" -type f -or -type l | cut -c $[${#BASE_DIR} + 1]-); do
-	echo "- $FILE" >> "$EXCLUDE"
-done
-unset IFS
-
 pinfo "Done."
 [ "y$UID" == "y0" ] || perror "You're not root. Cannot continue with rsync."
 
-- 
cgit v1.2.3-55-g7522


From 871a770457df234a3fe672aa5e8e4d3b3369f007 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 29 Jan 2014 17:41:57 +0100
Subject: also don't require stage_to_exclude anymore on command line

---
 scripts/clone_stage4 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts/clone_stage4')

diff --git a/scripts/clone_stage4 b/scripts/clone_stage4
index 339d9eea..8804a57a 100755
--- a/scripts/clone_stage4
+++ b/scripts/clone_stage4
@@ -18,11 +18,12 @@ qnd_exit() {
 	[ $# -ge 1 ] && kill "$1"
 }
 
-[ $# -lt 3 ]		&& perror "$0 <remote_ip> <stage_to_exclude> <target_dir>"
-[ "$1" = "local" ]	&& perror 'It is not wise to use "local" as remote IP.'
+[ $# -lt 2 ] && perror "$0 <remote_ip> <target_dir>"
+[ "$1" = "local" ] && perror 'It is not wise to use "local" as remote IP.'
 
 BOOT_DIR="${ROOT_DIR}/server/boot/$1"
-TARGET_DIR="$3"
+[ $# -eq 3 ] && shift # compat with old calling convention "$0 <remote_ip> <stage_to_exclude> <target_dir>"
+TARGET_DIR="$2"
 mkdir -p "$TARGET_DIR"
 mkdir -p "$BOOT_DIR"
 
-- 
cgit v1.2.3-55-g7522


From 5030004309ef0c01f911338dc1f2a08cf5f52cde Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 31 Jan 2014 00:03:50 +0100
Subject: [clone_stage4] Throw error if wrong number of arguments is given,
 instead of trying broken backwards compatibility mode

---
 scripts/clone_stage4 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'scripts/clone_stage4')

diff --git a/scripts/clone_stage4 b/scripts/clone_stage4
index 8804a57a..4c430aa8 100755
--- a/scripts/clone_stage4
+++ b/scripts/clone_stage4
@@ -15,14 +15,14 @@ MLTK_PID="$$"
 qnd_exit() {
 	unset_quiet
 	kill "$MLTK_PID"
-	[ $# -ge 1 ] && kill "$1"
+	[ $# -ge 1 ] && kill "$REMOTE_HOST"
 }
 
-[ $# -lt 2 ] && perror "$0 <remote_ip> <target_dir>"
-[ "$1" = "local" ] && perror 'It is not wise to use "local" as remote IP.'
+[ $# -ne 2 ] && perror "$0 <remote_ip> <target_dir> (-- Hint: <stage_to_exclude> is gone now, only two parameters are needed)"
+[ "$REMOTE_HOST" = "local" ] && perror 'It is not wise to use "local" as remote IP.'
 
-BOOT_DIR="${ROOT_DIR}/server/boot/$1"
-[ $# -eq 3 ] && shift # compat with old calling convention "$0 <remote_ip> <stage_to_exclude> <target_dir>"
+REMOTE_HOST="$1"
+BOOT_DIR="${ROOT_DIR}/server/boot/$REMOTE_HOST"
 TARGET_DIR="$2"
 mkdir -p "$TARGET_DIR"
 mkdir -p "$BOOT_DIR"
@@ -31,8 +31,8 @@ EXCLUDE="$BOOT_DIR/exclude-stage4"
 INCLUDE="$BOOT_DIR/include-stage4"
 
 pinfo "Building rsync exclude-file for building stage 4...."
-echo "## Exclude file for stage4 of $1" > "$EXCLUDE"
-echo "## Include file for stage4 of $1" > "$INCLUDE"
+echo "## Exclude file for stage4 of $REMOTE_HOST" > "$EXCLUDE"
+echo "## Include file for stage4 of $REMOTE_HOST" > "$INCLUDE"
 for FILE in $(find "$ROOT_DIR"/server/blacklists/*/ -type f); do
 	echo "## From $FILE" >> "$EXCLUDE"
 	echo "## From $FILE" >> "$INCLUDE"
@@ -46,11 +46,11 @@ pinfo "Done."
 # prepare rsync's options depending on whether the source is local or remote
 RSYNC_OPTS=""
 RSYNC_SOURCE=""
-if [[ "$1" == "local" ]]; then
+if [[ "$REMOTE_HOST" == "local" ]]; then
 	RSYNC_SOURCE="/"
 else
-	RSYNC_SOURCE="root@$1:/"
-	RSYNC_OPTS="-e ssh -oStrictHostKeyChecking=no"
+	RSYNC_SOURCE="root@$REMOTE_HOST:/"
+	RSYNC_OPTS="-e ssh -c arcfour -oStrictHostKeyChecking=no"
 fi
 
 pinfo "Cloning via rsync"
-- 
cgit v1.2.3-55-g7522