summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-01-29 17:38:36 +0100
committerSimon Rettberg2014-01-29 17:38:36 +0100
commitfb1e326df30daa27f8df8602fead52c607a12bea (patch)
tree13682e0a6c1cec9c1a93b6428ae61a40a087246f
parent[rfs-stage32] Speed up mounting tmp-partition and setting up zram swap (diff)
downloadtm-scripts-fb1e326df30daa27f8df8602fead52c607a12bea.tar.gz
tm-scripts-fb1e326df30daa27f8df8602fead52c607a12bea.tar.xz
tm-scripts-fb1e326df30daa27f8df8602fead52c607a12bea.zip
<clone_stage4> don't exclude stage32 anymore, aufs stacking order should take care of it
-rwxr-xr-xscripts/clone_stage412
1 files changed, 0 insertions, 12 deletions
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."