summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-12 17:00:29 +0200
committerSimon Rettberg2013-09-12 17:00:29 +0200
commitccefc690ad81d6a63ad09e16294a6961e76c5683 (patch)
treef408a599388035c4ccee1bb67bed13ca357b4ea6
parent[udhcp-script] Don't start nfs-mount (diff)
parent[mltk] Added mltk remote -n to help message (diff)
downloadtm-scripts-ccefc690ad81d6a63ad09e16294a6961e76c5683.tar.gz
tm-scripts-ccefc690ad81d6a63ad09e16294a6961e76c5683.tar.xz
tm-scripts-ccefc690ad81d6a63ad09e16294a6961e76c5683.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
-rwxr-xr-xmltk1
-rwxr-xr-xscripts/clone_stage43
2 files changed, 3 insertions, 1 deletions
diff --git a/mltk b/mltk
index d705df50..a36edc85 100755
--- a/mltk
+++ b/mltk
@@ -75,6 +75,7 @@ print_usage() {
echo -e " remote stage31 -c -b (clean all modules and build all linked modules in remote/targets/stage31 to remote/builds/stage31)"
echo -e " remote stage32 -c -b rootfs_stage31 sshd (clean all modules, build base, policykit and sshd in remote/builds/stage32)"
echo -e " remote stage32 -c base sshd -b sshd ldm -d (clean base and sshd, build sshd and ldm, be verbose)"
+ echo -e " remote -n (provides bind mount at /export/build for synchronizing)"
echo -e " server 1.2.3.4 -s (sync all builds from remote system 1.2.3.4)"
echo -e " server 1.2.3.4 stage32 -e stage32 (pack stage32 as squashfs+initramfs from remote system 1.2.3.4)"
echo -e " server 1.2.3.4 stage31 -c (clean stage31 build under server/remote_builds and initramfs under server/boot)"
diff --git a/scripts/clone_stage4 b/scripts/clone_stage4
index e24fd416..2704db02 100755
--- a/scripts/clone_stage4
+++ b/scripts/clone_stage4
@@ -18,7 +18,8 @@ qnd_exit() {
[ $# -ge 1 ] && kill "$1"
}
-[ $# -lt 3 ] && perror "$0 <remote_ip> <stage_to_exclude> <target_dir>"
+[ $# -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"