Hi,
gotcha :) another one needing export... The attached patch does it and adds
an --isolinux-splash command line parameter. It also documents them in man
pages and help message.
--
Cédric Lucantis
Index: doc/man/make-live.8
===================================================================
--- doc/man/make-live.8 (révision 337)
+++ doc/man/make-live.8 (copie de travail)
@@ -29,6 +29,8 @@
.IR FILE \||\| DIRECTORY \|]
.RB [\| \-\-include-image
.IR FILE \||\| DIRECTORY \|]
+.RB [\| \-\-isolinux\-splash
+.IR IMAGE \|]
.RB [\| \-k \||\| \-\-kernel
.IR KERNEL_FLAVOUR \|]
.RB [ \-\-manifest
@@ -117,6 +119,9 @@
.BI "\-\-include-image " FILE \||\| DIRECTORY
specifies a file or directory which will be copied inside the image. Instead of this flag, the environment variable LIVE_INCLUDE_IMAGE can be used (Default: empty).
.TP
+.BI "\-\-isolinux\-splash " IMAGE
+specifies an alternative boot splash image which must be in LSS16 format (see lss16toppm and ppmtolss16 from the syslinux package). Instead of this flag, the environment variable LIVE_ISOLINUX_SPLASH can be used (Default: none)
+.TP
.BI "\-k, \-\-kernel " KERNEL_FLAVOUR
specifies the kernel image flavour. Instead of this flag, the environment variable LIVE_KERNEL can be used (Default: auto-detected).
.TP
Index: doc/man/make-live.conf.5
===================================================================
--- doc/man/make-live.conf.5 (révision 337)
+++ doc/man/make-live.conf.5 (copie de travail)
@@ -14,6 +14,9 @@
.B LIVE_BOOTAPPEND
specifies additional bootparameters to the kernel (Default: none).
.TP
+.B LIVE_ISOLINUX_SPLASH
+specifies an alternative boot splash image which must be in LSS16 format (see lss16toppm and ppmtolss16 from the syslinux package). Instead of this environment variable, the flag \-\-isolinux\-splash can be used (Default: none).
+.TP
.B LIVE_CONFIG
uses another configuration file in addition to the default one, if existing, in /etc/make-live.conf. Settings in the additional configuration file do overwrite the settings from /etc/make-live.conf. Instead of this variable, the flag \-c or \-\-config can be used (Default: empty).
.TP
Index: src/config
===================================================================
--- src/config (révision 337)
+++ src/config (copie de travail)
@@ -15,6 +15,9 @@
# Boot parameters (Default: empty)
#LIVE_BOOTAPPEND=""
+# Boot splash image (Default: none)
+#LIVE_ISOLINUX_SPLASH=""
+
# Chroot directory (Default: ${LIVE_ROOT}/chroot)
#LIVE_CHROOT="${LIVE_ROOT}/chroot"
Index: src/scripts/02defaults.sh
===================================================================
--- src/scripts/02defaults.sh (révision 337)
+++ src/scripts/02defaults.sh (copie de travail)
@@ -372,5 +372,5 @@
# Variables that do not have defaults but need to be exported to
# allow other helpers to use their values
- export LIVE_BOOTAPPEND LIVE_BOOTSTRAP_CONFIG LIVE_INCLUDE_CHROOT LIVE_PRESEED
+ export LIVE_BOOTAPPEND LIVE_BOOTSTRAP_CONFIG LIVE_INCLUDE_CHROOT LIVE_PRESEED LIVE_ISOLINUX_SPLASH
}
Index: src/main.sh
===================================================================
--- src/main.sh (révision 337)
+++ src/main.sh (copie de travail)
@@ -45,7 +45,7 @@
. "${SCRIPT}"
done
-USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [-e|--encryption ALGORITHM] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--with-daemons] [--without-daemons] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE] [--tasks TASK]"
+USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [-e|--encryption ALGORITHM] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--with-daemons] [--without-daemons] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [--isolinux-splash IMAGE] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE] [--tasks TASK]"
Help ()
{
@@ -80,6 +80,7 @@
echo " --hook: specifies extra command(s)."
echo " --include-chroot: specifies file or directory for chroot inclusion."
echo " --include-image: specifies file or directory for image inclusion."
+ echo " --isolinux-splash: specifies an alternative boot splash image (in isolinux LSS16 format)."
echo " -k, --kernel: specifies debian kernel flavour."
echo " --manifest: specifies the pivot package to create filesystem.manifest-desktop upon (mostly \"ubuntu-live\")."
echo " -m, --mirror: specifies debian mirror."
@@ -173,7 +174,7 @@
Main ()
{
- ARGUMENTS="`getopt --longoptions root:,tasks:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,encryption:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-daemons,without-daemons,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:e:f:k:m:o:p:s:huv --shell sh -- "[EMAIL PROTECTED]"`"
+ ARGUMENTS="`getopt --longoptions root:,tasks:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,encryption:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,isolinux-splash:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-daemons,without-daemons,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:e:f:k:m:o:p:s:huv --shell sh -- "[EMAIL PROTECTED]"`"
if [ "${?}" != "0" ]
then
@@ -264,6 +265,11 @@
export LIVE_INCLUDE_IMAGE
;;
+ --isolinux-splash)
+ LIVE_ISOLINUX_SPLASH="${2}"; shift 2
+ export LIVE_ISOLINUX_SPLASH
+ ;;
+
-k|--kernel)
LIVE_KERNEL="${2}"; shift 2
export LIVE_KERNEL
_______________________________________________
Debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
