summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorFranz Dietrich2011-05-24 12:43:59 +0200
committerFranz Dietrich2011-05-24 12:43:59 +0200
commit6a549515edadc78ff3352bf37ac48c104b5a75d5 (patch)
treec2a8f21121e760b920d5def07fb218970b4eaf67 /inc
parentFix a whitespace (diff)
parentenv fixes .. (diff)
downloadusb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.tar.gz
usb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.tar.xz
usb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.zip
Merge branch 'master' of git://git.openslx.org/openslx-ng/usb-boot-stick
Diffstat (limited to 'inc')
-rw-r--r--inc/functions.env.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/inc/functions.env.sh b/inc/functions.env.sh
index 56cc49c..ab36fb7 100644
--- a/inc/functions.env.sh
+++ b/inc/functions.env.sh
@@ -101,14 +101,17 @@ read_params() {
run () {
- set_quiet
+ #set_quiet
+
+ if [ "x$CLEAN" = "x1" ]; then
+ [ "x$TARGET_INIT" = "x1" ] && rm -rf $ROOT_DIR/contrib/syslinux/sys*
+ [ "x$TARGET_KERNEL" = "x1" ] && rm -rf $ROOT_DIR/build/linux-*
+ fi
- pre_start_cleanup
- setup_dir_structure
- copy_files
- create_iso
+ [ "x$TARGET_KERNEL" = "x1" ] && $ROOT_DIR/bin/build.kernel.sh
+ [ "x$TARGET_INIT" = "x1" ] && $ROOT_DIR/bin/build.initramfs.sh
- unset_quiet
+ #unset_quiet
- pinfo "FINISHED: ISO can be found here: $ROOT_DIR/openslx.iso!"
-} \ No newline at end of file
+ pinfo "FINISHED"
+}