-grml-live (0.9.36~0.pre1) UNRELEASED; urgency=low
-
- * No entries yet, will be adjusted via git-dch for stable release.
-
- -- Michael Prokop <mika@grml.org> Mon, 15 Feb 2010 11:36:42 +0100
+grml-live (0.9.36) unstable; urgency=low
+
+ * scripts/GRMLBASE/39-modprobe: Make sure all modprobe configuration
+ files use .conf as filename suffix. [Closes: issue647]
+ * Disable PDiffs by default via /etc/apt/apt.conf.d/20pdiffs.
+ * 90-update-alternatives: check for symlinks of iceweasel and
+ mount.ntfs-3g and force creation of /sbin/mount.ntfs symlink.
+ * Rework addons handling (make sure to install boot addons independent
+ from bsd4grml which might be disabled).
+ * Updated boot manager teamplates (simplify syslinux.cfg,
+ update failsafe bootoption, add GPXE to grub.cf, drop duplicate
+ boot=live from grub.cfg)
+ * Do not bailout if reading dpkg.list fails, instead assume user
+ is running a dirty build and display a warning message.
+ * Check for precense of grub directory and files in templates
+ that we are adjusting on-the-fly and skip non-existing ones
+ so customisation of templates is easier.
+ * Software related changes:
+ - Add grml-quickconfig to GRMLBASE.
+ - Add grml-quickconfig-standard to GRML_* classes.
+ - Drop 3ware-cli-binary (license unclear).
+ - Drop rar from GRML_FULL (license).
+ - Drop xlockmore from GRML_FULL (using vlock instead in grml-lock).
+ - Move grml-docs from GRMLBASE to GRML_{SMALL,MEDIUM,FULL} to be
+ able to customize it easier.
+
+ -- Michael Prokop <mika@grml.org> Tue, 23 Feb 2010 15:49:20 +0100
grml-live (0.9.35) unstable; urgency=low
set -e
# global variables
-GRML_LIVE_VERSION='0.9.36-pre1'
+GRML_LIVE_VERSION='0.9.36'
PN="$(basename $0)"
CMDLINE="$0 $@"
SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
fi # no "$TEMPLATE_DIRECTORY"/boot/addons
fi # NO_ADDONS
- if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
- cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
+ if ! [ -d ${TEMPLATE_DIRECTORY}/boot/grub ] ; then
+ log "grub templates do not exist, skipping therefore."
+ ewarn "grub templates do not exist, skipping therefore." ; eend 0
+ else
+ if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
+ cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
+ fi
+
+ # make sure we have recent template files available, otherwise updating
+ # the strings like $GRML_NAME and $VERSION might be out of date
+ cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/
fi
- # make sure we have recent template files available, otherwise updating
- # the strings like $GRML_NAME and $VERSION might be out of date
- cp ${TEMPLATE_DIRECTORY}/boot/grub/* "$BUILD_OUTPUT"/boot/grub/
if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then
log "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting."
RELEASE_INFO="$(cut_string 68 "$RELEASE_INFO")"
RELEASE_INFO="$(extend_string_end 68 "$RELEASE_INFO")"
- sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/GRML/grml-version
- sed -i "s/%DATE%/$DATE/" "$BUILD_OUTPUT"/GRML/grml-version
+ if [ -r "$BUILD_OUTPUT"/GRML/grml-version ] ; then
+ sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/GRML/grml-version
+ sed -i "s/%DATE%/$DATE/" "$BUILD_OUTPUT"/GRML/grml-version
+ fi
# make sure the squashfs filename is set accordingly:
SQUASHFS_NAME="$GRML_NAME.squashfs"
# adjust all variables in the templates with the according distribution information
for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \
"${BUILD_OUTPUT}"/boot/grub/* ; do
- sed -i "s/%ARCH%/$ARCH/g" "${file}"
- sed -i "s/%DATE%/$DATE/g" "${file}"
- sed -i "s/%DISTRI_INFO%/$DISTRI_INFO/g" "${file}"
- sed -i "s/%DISTRI_NAME%/$DISTRI_NAME/g" "${file}"
- sed -i "s/%DISTRI_SPLASH%/$DISTRI_SPLASH/g" "${file}"
- sed -i "s/%GRML_NAME%/$GRML_NAME/g" "${file}"
- sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/g" "${file}"
- sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g" "${file}"
- sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}"
- sed -i "s/%VERSION%/$VERSION/g" "${file}"
-
- [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s/ boot=live/ boot=live $DEFAULT_BOOTOPTIONS/" "${file}"
-
- if [ -n "$NO_BOOTID" ] ; then
- sed -i "s/ bootid=%BOOTID%//g" "${file}" # drop bootid bootoption
- else
- sed -i "s/%BOOTID%/$BOOTID/g" "${file}" # adjust bootid=... argument
+ if [ -r "${file}" ] ; then
+ sed -i "s/%ARCH%/$ARCH/g" "${file}"
+ sed -i "s/%DATE%/$DATE/g" "${file}"
+ sed -i "s/%DISTRI_INFO%/$DISTRI_INFO/g" "${file}"
+ sed -i "s/%DISTRI_NAME%/$DISTRI_NAME/g" "${file}"
+ sed -i "s/%DISTRI_SPLASH%/$DISTRI_SPLASH/g" "${file}"
+ sed -i "s/%GRML_NAME%/$GRML_NAME/g" "${file}"
+ sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/g" "${file}"
+ sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g" "${file}"
+ sed -i "s/%SHORT_NAME%/$SHORT_NAME/g" "${file}"
+ sed -i "s/%VERSION%/$VERSION/g" "${file}"
+
+ [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s/ boot=live/ boot=live $DEFAULT_BOOTOPTIONS/" "${file}"
+
+ if [ -n "$NO_BOOTID" ] ; then
+ sed -i "s/ bootid=%BOOTID%//g" "${file}" # drop bootid bootoption
+ else
+ sed -i "s/%BOOTID%/$BOOTID/g" "${file}" # adjust bootid=... argument
+ fi
fi
done
# adjust bootsplash accordingly but make sure the string has the according lenght
SQUASHFS_NAME="$(cut_string 20 "$SQUASHFS_NAME")"
SQUASHFS_NAME="$(extend_string_end 20 "$SQUASHFS_NAME")"
- sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "$BUILD_OUTPUT"/boot/isolinux/f4
- sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "$BUILD_OUTPUT"/boot/isolinux/f5
+ for file in f4 f5 ; do
+ if [ -r "${BUILD_OUTPUT}/boot/isolinux/${file}" ] ; then
+ sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "${BUILD_OUTPUT}/boot/isolinux/${file}"
+ sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "${BUILD_OUTPUT}/boot/isolinux/${file}"
+ fi
+ done
# generate addon list
rm "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg
- else
+ elif [ -e "$BUILD_OUTPUT"/boot/grub/menu.lst -a -e "$BUILD_OUTPUT"/boot/grub/grub.cfg ] ; then
sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/menu.lst
sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/grub.cfg
fi