[mltk] updated the print_usage a bit and separated remote/server options to improve readability

1 files changed, 20 insertions, 12 deletions

diff --git a/mltk b/mltk
index 2ba63fc4..f12000fd 100755
--- a/mltk
+++ b/mltk
@@ -60,33 +60,41 @@ print_usage() {
 	echo -e "     server \t server mode: packs stage3.1, stage3.2 or addons as initramfs/squashfs."
 	echo -e "     remote \t remote mode: builds a minimal rootfs based on the activated modules in <target>"
 	echo -e ""
-	echo -e "  Mode options:"
-	echo -e "     -b            remote: build module(s)"
-	echo -e "     -e type       server: export target as stage31, stage32 or addons"
-	echo -e "     -s            server: sync 'builds' directory of remote host"
-	echo -e "     -c            remote: clean module(s). / server: clean target in remote_builds/ and corresponding files under boot/"
-	echo -e "     -d            activates debug output for current target/build"
-	echo -e "     -p profile    remote: build all modules from given profile"
+	echo -e "  Global options (valid for all modes):"
+	echo -e "     -d            activates debug output for the task"
+	echo -e "  "
+	echo -e "  Options for 'remote'-mode:"
+	echo -e "     -b            build module(s) and copy them to the target build directory"
+	echo -e "     -c            clean build directory of module(s)."
+	echo -e "     -p profile    build all modules from given profile (DEPRECATED?)"
+	echo -e "     -n            bind mount all the local builds under remote/builds to /export/builds."
+	echo -e "		    Allows for syncing from the server machine using the '-s'-flag."
 	echo -e ""
 	echo -e "  In mode 'remote', you can pass names of specific modules to clean/build."
 	echo -e "  Otherwise, all modules will be built/cleaned."
 	echo -e ""
+	echo -e "  Options for 'server'-mode:"
+	echo -e "     -e type       export target as 'type'. type can be of 'stage31' (simple initramfs), 'stage32' or 'addons' (both beeing squashfs)"
+	echo -e "     -s            sync 'builds' directory of remote host"
+	echo -e "     -c            clean target in remote_builds/ and corresponding files under boot/"
+	echo -e ""
+	echo -e "--------------------------------------------------------------------------------------------------------------------------------------"
+	echo -e ""
 	echo -e "  Examples:"
-	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 stage31 -c -b   				(clean all modules and build all linked modules in remote/targets/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 stage32 -e stage32			(packs stage32 as squashfs 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)"
 	echo -e "     server 1.2.3.4 addons-eexam -e addons		(pack eexam-addons as squashfs)"
 	echo -e "     server 1.2.3.4 -k [configname]			(generate config file configs/config.tgz)"
 	echo -e ""
 	echo -e "  Existing targets for remote are:"
 	echo -e "    $(echo $(ls ${ROOT_DIR}/remote/targets 2>/dev/null || echo "No targets for remote found."))"
-	echo -e "  Existing targets for server are:"
-	echo -e "<TODO: Scan mirrored remote machines and the targets they contain>"
-	echo -e "*** Use 'local' as the remotehost if you're running the server part on the same machine as the remote part ***"
+	echo -e ""
+	echo -e " NOTE: Use 'local' as the remote host if you're running the server part on the same machine as the remote part."
 	echo -e ""
 }