* grml_cleanup_chroot: drop the /usr/include/linux checks.
* 90-update-alternatives: use wm-ng as default x-window-manager.
[Closes: issue716]
+ * Provide information about grml-live version and Debian/suite
+ through /etc/grml_live_version in the generated ISO. [Closes: issue637]
- -- Michael Prokop <mika@grml.org> Wed, 05 Aug 2009 04:19:14 +0200
+ -- Michael Prokop <mika@grml.org> Wed, 05 Aug 2009 04:27:20 +0200
grml-live (0.9.20) unstable; urgency=low
EOF
# retrieve build information ($SUITE):
-if [ -r $target/etc/grml/grml-live-build-info ] ; then
- . $target/etc/grml/grml-live-build-info
+if [ -r $target/etc/grml_live_version ] ; then
+ . $target/etc/grml_live_version
fi
# if we stil do not know which Debian suite we are building assume "stable"
else
[ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot"
- # inform fai about the suite we build
- if [ -n "$SUITE" ] ; then
- [ -d "$CHROOT_OUTPUT/etc/grml" ] || mkdir -p "$CHROOT_OUTPUT/etc/grml"
- echo "SUITE=$SUITE" > "$CHROOT_OUTPUT/etc/grml/grml-live-build-info"
- fi
+ # provide inform fai about the ISO we build
+ echo '# This file has been generated by grml-live.' > "$CHROOT_OUTPUT/etc/grml_live_version"
+ [ -n "$GRML_LIVE_VERSION" ] && echo "GRML_LIVE_VERSION=$GRML_LIVE_VERSION" >> "$CHROOT_OUTPUT/etc/grml_live_version"
+ [ -n "$SUITE" ] && echo "SUITE=$SUITE" >> "$CHROOT_OUTPUT/etc/grml_live_version"
if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then
FAI_ACTION=softupdate