projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5d8883
)
Display use of ZLIB in overview dialog
author
Michael Prokop
<devnull@localhost>
Sun, 9 Dec 2007 14:11:09 +0000
(15:11 +0100)
committer
Michael Prokop
<devnull@localhost>
Sun, 9 Dec 2007 14:11:09 +0000
(15:11 +0100)
grml-live
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
2d8781e
..
970fa6b
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-207,7
+207,7
@@
while getopts "a:C:c:g:i:o:r:s:t:v:FhuVz" opt; do
h) usage ; bailout 0 ;;
u) UPDATE=1 ;;
V) VERBOSE="-v" ;;
h) usage ; bailout 0 ;;
u) UPDATE=1 ;;
V) VERBOSE="-v" ;;
- z) SQUASHFS_
COMPRESSION
="-nolzma" ;;
+ z) SQUASHFS_
ZLIB
="-nolzma" ;;
?) echo "invalid option -$OPTARG" >&2; bailout 1 ;;
esac
done
?) echo "invalid option -$OPTARG" >&2; bailout 1 ;;
esac
done
@@
-242,6
+242,7
@@
if [ -z "$FORCE" ] ; then
[ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS"
[ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE"
[ -n "$VERBOSE" ] && echo " Using VERBOSE mode."
[ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS"
[ -n "$LOGFILE" ] && echo " Logging to file: $LOGFILE"
[ -n "$VERBOSE" ] && echo " Using VERBOSE mode."
+ [ -n "$SQUASHFS_ZLIB" ] && echo " Using ZLIB (instead od LZMA) compression."
[ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation."
echo
echo -n "Is this ok for you? [y/N] "
[ -n "$UPDATE" ] && echo " Executing UPDATE instead of fresh installation."
echo
echo -n "Is this ok for you? [y/N] "
@@
-537,7
+538,7
@@
else
# execute squashfs:
log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend"
# execute squashfs:
log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend"
- mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_
COMPRESSION
+ mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_
ZLIB
log "Finished execution of stage 'squashfs' [$(date)]"
einfo "Finished execution of stage 'squashfs'" ; eend 0
fi
log "Finished execution of stage 'squashfs' [$(date)]"
einfo "Finished execution of stage 'squashfs'" ; eend 0
fi