projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add busybox to /etc/grml/fai/config/package_config/GRML as it is essential for initra...
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
78053dc
..
0f412af
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-136,8
+136,9
@@
if [ -d "$CHROOT_TARGET" ] ; then
else
mkdir "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI"
fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS
else
mkdir "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI"
fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS
- umount $CHROOT_TARGET/proc 2>/dev/null
- umount $CHROOT_TARGET/sys 2>/dev/null
+ umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
+ umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true
+ echo " [*] Finished execution of stage 'fai dirinstall'"
fi
# }}}
fi
# }}}
@@
-172,7
+173,7
@@
if [ "$ARCH" = x86 ] ; then
# boot.cat
if [ -n "$WINDOWS_BINARIES" ] ; then
if [ -d "$BUILD_TARGET"/windows ] ; then
# boot.cat
if [ -n "$WINDOWS_BINARIES" ] ; then
if [ -d "$BUILD_TARGET"/windows ] ; then
- echo " [x] $BUILD_TARGET/windows exists already - skipping stage
WINDOWS_BINARIES
"
+ echo " [x] $BUILD_TARGET/windows exists already - skipping stage
'WINDOWS_BINARIES'
"
return 0
else
mkdir "$BUILD_TARGET"/windows
return 0
else
mkdir "$BUILD_TARGET"/windows
@@
-181,14
+182,16
@@
if [ "$ARCH" = x86 ] ; then
wget ${WINDOWS_BINARIES}/${file}.exe
done )
fi
wget ${WINDOWS_BINARIES}/${file}.exe
done )
fi
+ echo " [*] Finished execution of stage 'WINDOWS_BINARIES'"
fi
fi
+ echo " [*] Finished execution of stage 'boot/isolinux'"
fi
# amd64:
elif [ "$ARCH" = amd64 ] ; then
fi
# amd64:
elif [ "$ARCH" = amd64 ] ; then
- echo 'Warning: gebi, it is your turn. :)'>2
+ echo 'Warning: gebi, it is your turn. :)'>
&
2
# ppc:
# ppc:
-elif [ "$ARCH" = ppc ] ; then
- echo 'Warning: formorer, it is your turn. :)'>2
+elif [ "$ARCH" = p
ower
pc ] ; then
+ echo 'Warning: formorer, it is your turn. :)'>
&
2
# unsuported:
else
echo 'Warning: Unsupported ARCH, sorry. Want to support it? Contribute!'>&2
# unsuported:
else
echo 'Warning: Unsupported ARCH, sorry. Want to support it? Contribute!'>&2
@@
-200,6
+203,7
@@
else
mkdir "$BUILD_TARGET"/live
mksquashfs $CHROOT_TARGET/* $BUILD_TARGET/live/grml.squashfs -noappend
fi
mkdir "$BUILD_TARGET"/live
mksquashfs $CHROOT_TARGET/* $BUILD_TARGET/live/grml.squashfs -noappend
fi
+echo " [*] Finished execution of stage 'squashfs'"
# }}}
# ISO_TARGET - mkisofs {{{
# }}}
# ISO_TARGET - mkisofs {{{
@@
-214,7
+218,7
@@
else
-c boot/isolinux/boot.cat -b boot/isolinux/isolinux.bin \
-o "$ISO_TARGET"/grml_0.0-1.iso .
)
-c boot/isolinux/boot.cat -b boot/isolinux/isolinux.bin \
-o "$ISO_TARGET"/grml_0.0-1.iso .
)
-
+ echo " [*] Finished execution of stage 'iso build'"
fi
# }}}
fi
# }}}