manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub: remove old and unused splash code 

The LB_GRUB_SPLASH variable is populated by the --grub-splash param
but is not actually used for anything.

Gbp-Dch: Short
This commit is contained in:
jnqnfe 2015-01-30 00:47:20 +00:00 committed by Luca Boccassi
parent 01a6de2f4c
commit 4fa83598a3
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions/defaults.sh
View File

@ -644,9 +644,6 @@ Set_config_defaults ()
LB_BOOTAPPEND_INSTALL="$(echo ${LB_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')" LB_BOOTAPPEND_INSTALL="$(echo ${LB_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')"
# Setting grub splash
# LB_GRUB_SPLASH
# Setting iso author # Setting iso author
case "${LB_MODE}" in case "${LB_MODE}" in
debian) debian)

4
manpages/en/lb_config.1
View File

@ -109,8 +109,6 @@
[\fB\-\-firmware\-chroot\fR true|false] [\fB\-\-firmware\-chroot\fR true|false]
.br .br
[\fB\-\-force\fR] [\fB\-\-force\fR]
.br
[\fB\-\-grub\-splash\fR \fIFILE\fR]
.br .br
[\fB\-\-gzip\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"] [\fB\-\-gzip\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
.br .br
@ -353,8 +351,6 @@ includes firmware packages in debian-installer. Defaults to true.
includes firmware packages in the live image. Defaults to true. Beware that some firmware packages are non-free and will only be included if the non-free archive area is included in \-\-archive\-areas (and \-\-parent\-archive\-areas). This is particularly relevant if you want working wifi for instance. includes firmware packages in the live image. Defaults to true. Beware that some firmware packages are non-free and will only be included if the non-free archive area is included in \-\-archive\-areas (and \-\-parent\-archive\-areas). This is particularly relevant if you want working wifi for instance.
.IP "\fB\-\-force\fR" 4 .IP "\fB\-\-force\fR" 4
forces re\-execution of already run stages. Use only if you know what you are doing. It is generally safer to use \fBlb clean\fR to clean up before re\-executing \fBlb build\fR. forces re\-execution of already run stages. Use only if you know what you are doing. It is generally safer to use \fBlb clean\fR to clean up before re\-executing \fBlb build\fR.
.IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4
defines the name of an optional to be included splash screen graphic for the grub bootloader.
.IP "\fB\-\-gzip\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 .IP "\fB\-\-gzip\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
defines the default options that will be appended to (almost) every gzip call during the building of the image. By default, this is set to \-\-best to use highest (but slowest) compression. Dynamically, if the host system supports it, also \-\-rsyncable is added. defines the default options that will be appended to (almost) every gzip call during the building of the image. By default, this is set to \-\-best to use highest (but slowest) compression. Dynamically, if the host system supports it, also \-\-rsyncable is added.
.IP "\fB\-\-hdd\-label\fR \fILABEL\fR" 4 .IP "\fB\-\-hdd\-label\fR \fILABEL\fR" 4

7
scripts/build/config
View File

@ -68,7 +68,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--firmware-binary true|false]\n\ \t [--firmware-binary true|false]\n\
\t [--firmware-chroot true|false]\n\ \t [--firmware-chroot true|false]\n\
\t [--force]\n\ \t [--force]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\ \t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--hdd-label LABEL]\n\ \t [--hdd-label LABEL]\n\
\t [--hdd-partition-start START]\n\ \t [--hdd-partition-start START]\n\
@ -596,7 +595,7 @@ Local_arguments ()
;; ;;
--grub-splash) --grub-splash)
LB_GRUB_SPLASH="${2}" Echo_warning "--grub-splash is an obsolete option"
shift 2 shift 2
;; ;;
@ -1288,10 +1287,6 @@ LB_DEBIAN_INSTALLER_PRESEEDFILE="${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
# (Default: ${LB_DEBIAN_INSTALLER_GUI}) # (Default: ${LB_DEBIAN_INSTALLER_GUI})
LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}" LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}"
# \$LB_GRUB_SPLASH: set custom grub splash
# (Default: empty)
LB_GRUB_SPLASH="${LB_GRUB_SPLASH}"
# \$LB_HDD_LABEL: set hdd label # \$LB_HDD_LABEL: set hdd label
# (Default: ${LB_HDD_LABEL}) # (Default: ${LB_HDD_LABEL})
LB_HDD_LABEL="${LB_HDD_LABEL}" LB_HDD_LABEL="${LB_HDD_LABEL}"