summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-02-05 16:51:08 +0100
committerJonathan Bauer2013-02-05 16:51:08 +0100
commitda1d7c15669ad4f6a12eb1a0170dc295da619611 (patch)
treee5b01f092dc6e6a0efea909d4f20dcce61384337
parentgerman keymap (diff)
downloadtm-scripts-da1d7c15669ad4f6a12eb1a0170dc295da619611.tar.gz
tm-scripts-da1d7c15669ad4f6a12eb1a0170dc295da619611.tar.xz
tm-scripts-da1d7c15669ad4f6a12eb1a0170dc295da619611.zip
improved usage info
-rwxr-xr-xmltk5
-rwxr-xr-xserver/build_core4
2 files changed, 6 insertions, 3 deletions
diff --git a/mltk b/mltk
index 0e244752..2329e707 100755
--- a/mltk
+++ b/mltk
@@ -100,10 +100,13 @@ read_params() {
shift
;;
*)
- break
+ break
;;
esac
done
+
+ # exit if no command
+ [ "x$BUILD" = "x" -a "x$CLEAN" = "x" ] && print_usage && exit 1
TOOLS="$@"
}
diff --git a/server/build_core b/server/build_core
index c9aa7add..8435a4fe 100755
--- a/server/build_core
+++ b/server/build_core
@@ -28,7 +28,7 @@ STAGE32_DIR=${ROOT_DIR}/remote/stage3.2
initial_checks() {
if [ ! -d ${STAGE32_DIR} ];
then
- echo "No stage3.2 directory found. Please run setup_tools first."
+ echo "No stage3.2 directory found. Please run \"./mltk tools build\" first."
exit 1
fi
@@ -53,6 +53,7 @@ initial_checks() {
cp -r /lib/modules/$(uname -r) ${STAGE32_DIR}/lib/modules/
fi
+ # TODO: check for aufs and squaskfs modules
}
generate_initramfs() {
@@ -88,7 +89,6 @@ generate_initramfs() {
generate_squashfs() {
# finalize the initramfs target
- [ ! -d ${STAGE32_DIR} ] && echo "No stage3.2 directory found. Please run setup_tools first." && exit 1
[ -e ${STAGE31_DIR}/mnt/openslx.sqfs ] && rm ${STAGE31_DIR}/mnt/openslx.sqfs
mksquashfs ${STAGE32_DIR} ${STAGE31_DIR}/mnt/openslx.sqfs -comp xz -b 1M -no-recovery 2>/dev/null