[Debian-live-changes] r940 - in dists/trunk/live-helper: doc
helpers templates/grub
Daniel Baumann
daniel at alioth.debian.org
Thu Apr 5 18:42:18 UTC 2007
Author: daniel
Date: 2007-04-05 18:42:18 +0000 (Thu, 05 Apr 2007)
New Revision: 940
Modified:
dists/trunk/live-helper/doc/ChangeLog
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/templates/grub/menu.lst
Log:
Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-04-05 17:09:51 UTC (rev 939)
+++ dists/trunk/live-helper/doc/ChangeLog 2007-04-05 18:42:18 UTC (rev 940)
@@ -1,28 +1,33 @@
-2006-04-03 Daniel Baumann <daniel at debian.org>
+2007-04-05 Daniel Baumann <daniel at debian.org>
+ * helpers/lh_binary_grub, templates/grub/menu.lst:
+ - Added splash functionality.
+
+2007-04-03 Daniel Baumann <daniel at debian.org>
+
* helpers/lh_binary_grub, lh_binary_grub:
- Added check for LIVE_TEMPLATES to be existing.
* helpers/lh_binary_includes:
- Added check for LIVE_INCLUDES to be existing.
-2006-04-02 Daniel Baumann <daniel at debian.org>
+2007-04-02 Daniel Baumann <daniel at debian.org>
* functions/*, helpers/*:
- Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
* helpers/lh_binary_iso:
- Added exclude for the bootloader from the iso image content.
-2006-04-01 Daniel Baumann <daniel at debian.org>
+2007-04-01 Daniel Baumann <daniel at debian.org>
* helper/lh_binary_grub:
- Added.
-2006-03-30 Daniel Baumann <daniel at debian.org>
+2007-03-30 Daniel Baumann <daniel at debian.org>
* helper/lh_chroot_localincludes:
- Fixed wrong path for hook removal.
-2006-03-29 Daniel Baumann <daniel at debian.org>
+2007-03-29 Daniel Baumann <daniel at debian.org>
* functions/common.sh, echo.sh:
- Added.
@@ -35,17 +40,17 @@
* manpages/lh_chroot.1:
- Added.
-2006-03-28 Daniel Baumann <daniel at debian.org>
+2007-03-28 Daniel Baumann <daniel at debian.org>
* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
- Added --debug, --quiet, and --verbose.
-2006-03-27 Daniel Baumann <daniel at debian.org>
+2007-03-27 Daniel Baumann <daniel at debian.org>
* helpers/lh_binary_linuximage, lh_binary_memtest86:
- Added missing Read_conffiles to fix foreign architecture builds.
-2006-03-26 Daniel Baumann <daniel at debian.org>
+2007-03-26 Daniel Baumann <daniel at debian.org>
* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
lh_clean:
@@ -56,13 +61,13 @@
* lists/gnome*, kde*, standard-x11, xfce*:
- Added menu.
-2006-03-26 Daniel Baumann <daniel at debian.org>
+2007-03-26 Daniel Baumann <daniel at debian.org>
* functions/defaults.sh:
- Fixed handling of desktop list variable loop.
* Uploaded 1.0~a3-1.
-2006-03-25 Daniel Baumann <daniel at debian.org>
+2007-03-25 Daniel Baumann <daniel at debian.org>
* functions/*, helpers/*:
- Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
@@ -93,7 +98,7 @@
* lists/minimal-net:
- Minimized.
-2006-03-24 Daniel Baumann <daniel at debian.org>
+2007-03-24 Daniel Baumann <daniel at debian.org>
* functions/*, helpers/*, hooks/*:
- Added GPL blurb.
@@ -111,12 +116,12 @@
* helpers/lh_clean:
- Added purge.
-2006-03-23 Daniel Baumann <daniel at debian.org>
+2007-03-23 Daniel Baumann <daniel at debian.org>
* helpers/make-live:
- Calling Arguments twice to catch case with non-default root.
-2006-03-22 Daniel Baumann <daniel at debian.org>
+2007-03-22 Daniel Baumann <daniel at debian.org>
* functions/default.sh, helpers/*:
- Renamed lh_chroot_packageslist to lh_chroot_packageslists and
@@ -129,7 +134,7 @@
- Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
local packages.
-2006-03-21 Daniel Baumann <daniel at debian.org>
+2007-03-21 Daniel Baumann <daniel at debian.org>
* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
- Checking earlier if there is something todo.
@@ -148,17 +153,17 @@
- Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
-2006-03-20 Daniel Baumann <daniel at debian.org>
+2007-03-20 Daniel Baumann <daniel at debian.org>
* helpers/make-live:
- Fixed typo in ARGUMENTS.
-2006-03-19 Daniel Baumann <daniel at debian.org>
+2007-03-19 Daniel Baumann <daniel at debian.org>
* lists/gnome*, kde*, standard-x11, xfce*:
- Added alsa-base, alsa-oss, alsa-utils, and discover.
-2006-03-19 Daniel Baumann <daniel at debian.org>
+2007-03-19 Daniel Baumann <daniel at debian.org>
* Uploaded 1.0~a2-1.
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-05 17:09:51 UTC (rev 939)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-05 18:42:18 UTC (rev 940)
@@ -184,10 +184,11 @@
then
# FIXME
cp "${LIVE_GRUB_SPLASH}" binary/boot/grub
+
+ LIVE_SPLASH="splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`"
fi
# Configure grub templates
-
cat >> binary/boot/grub/menu.lst << EOF
# This is a divider, added to separate the menu items below from the Debian
# ones.
@@ -198,7 +199,7 @@
LIVE_MEMTEST
EOF
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+ sed -i -e "s#LIVE_SPLASH#${LIVE_SPLASH}#" -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
;;
esac
Modified: dists/trunk/live-helper/templates/grub/menu.lst
===================================================================
--- dists/trunk/live-helper/templates/grub/menu.lst 2007-04-05 17:09:51 UTC (rev 939)
+++ dists/trunk/live-helper/templates/grub/menu.lst 2007-04-05 18:42:18 UTC (rev 940)
@@ -115,6 +115,8 @@
## ## End Default Options ##
+LIVE_SPLASH
+
LIVE_KERNEL_LIVE
LIVE_KERNEL_INSTALL
More information about the Debian-live-changes
mailing list