projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install all files from /etc/grml/fai/files/etc/apt; move /etc/grml/fai/apt/preference...
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
58dc908
..
cfbc0b3
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-39,7
+39,7
@@
Usage: $PN [options, see as follows]
-o <output_directory> main output directory of the build process
-q skip mksquashfs
-r <release_name< release name
-o <output_directory> main output directory of the build process
-q skip mksquashfs
-r <release_name< release name
- -s <suite> Debian suite; values: etch, lenny, sid
+ -s <suite> Debian suite; values: etch, lenny, s
queeze, s
id
-t <template_directory> place of the templates
-u update existing chroot instead of rebuilding it from scratch
-v <version_number> specify version number of the release
-t <template_directory> place of the templates
-u update existing chroot instead of rebuilding it from scratch
-v <version_number> specify version number of the release
@@
-356,7
+356,7
@@
if [ -n "$SUITE" ] ; then
for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
if [ -n "$file" ] ; then
sed -i "s/SUITE=.*/SUITE=\"$SUITE\"/" $LIVE_CONF
for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
if [ -n "$file" ] ; then
sed -i "s/SUITE=.*/SUITE=\"$SUITE\"/" $LIVE_CONF
- DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\ testing\ \|\ sid\ \|\ unstable\ "
+ DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\
squeeze \|\
testing\ \|\ sid\ \|\ unstable\ "
sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $file
fi
done
sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $file
fi
done
@@
-702,12
+702,17
@@
else
-b $BOOT_FILE \
-o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
-b $BOOT_FILE \
-o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
- # generate md5sum of ISO if we are using class 'RELEASE':
+ # generate md5sum
and sha1sum
of ISO if we are using class 'RELEASE':
case $CLASSES in *RELEASE*)
[ "$RC" = 0 ] && \
case $CLASSES in *RELEASE*)
[ "$RC" = 0 ] && \
- ( cd $ISO_OUTPUT && \
- md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \
- touch -r ${ISO_NAME} ${ISO_NAME}.md5 )
+ (
+ if cd $ISO_OUTPUT ; then
+ md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \
+ touch -r ${ISO_NAME} ${ISO_NAME}.md5
+ sha1sum ${ISO_NAME} > ${ISO_NAME}.sha1 && \
+ touch -r ${ISO_NAME} ${ISO_NAME}.sha1
+ fi
+ )
;;
esac
;;
esac