diff options
| -rwxr-xr-x | scripts/build/binary_syslinux | 15 | ||||
| -rw-r--r-- | share/bootloaders/extlinux/splash.svg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/splash.svg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/splash.svg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/splash.svg.in | 2 |
5 files changed, 4 insertions, 19 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 453bd8a35..8e20ff730 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -232,24 +232,10 @@ _LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Install case "${LB_MODE}" in progress-linux) _PROJECT="Progress Linux" - - if ls config/package-lists/base-system.list* - then - _DESCRIPTION="Base System" - elif ls config/package-lists/gnome-desktop.list* - then - _DESCRIPTION="GNOME Desktop" - elif ls config/package-lists/lxc-server.list* > /dev/null 2>&1 - then - _DESCRIPTION="LXC Server" - else - _DESCRIPTION="" - fi ;; *) _PROJECT="Debian GNU/Linux" - _DESCRIPTION="" ;; esac @@ -266,7 +252,6 @@ do -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@VERSION@|${_VERSION}|g" \ -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \ - -e "s|@DESCRIPTION@|${_DESCRIPTION}|g" \ -e "s|@DATE@|${_DATE}|g" \ -e "s|@YEAR@|${_YEAR}|g" \ -e "s|@MONTH@|${_MONTH}|g" \ diff --git a/share/bootloaders/extlinux/splash.svg.in b/share/bootloaders/extlinux/splash.svg.in index 4c3e3d352..8e8b4d778 100644 --- a/share/bootloaders/extlinux/splash.svg.in +++ b/share/bootloaders/extlinux/splash.svg.in @@ -244,7 +244,7 @@ x="190.68135" sodipodi:role="line" style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold" - id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan + id="tspan3041">@ARCHITECTURE@</tspan><tspan y="659.20679" x="190.68135" sodipodi:role="line" diff --git a/share/bootloaders/isolinux/splash.svg.in b/share/bootloaders/isolinux/splash.svg.in index 4c3e3d352..8e8b4d778 100644 --- a/share/bootloaders/isolinux/splash.svg.in +++ b/share/bootloaders/isolinux/splash.svg.in @@ -244,7 +244,7 @@ x="190.68135" sodipodi:role="line" style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold" - id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan + id="tspan3041">@ARCHITECTURE@</tspan><tspan y="659.20679" x="190.68135" sodipodi:role="line" diff --git a/share/bootloaders/pxelinux/splash.svg.in b/share/bootloaders/pxelinux/splash.svg.in index 4c3e3d352..8e8b4d778 100644 --- a/share/bootloaders/pxelinux/splash.svg.in +++ b/share/bootloaders/pxelinux/splash.svg.in @@ -244,7 +244,7 @@ x="190.68135" sodipodi:role="line" style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold" - id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan + id="tspan3041">@ARCHITECTURE@</tspan><tspan y="659.20679" x="190.68135" sodipodi:role="line" diff --git a/share/bootloaders/syslinux/splash.svg.in b/share/bootloaders/syslinux/splash.svg.in index 4c3e3d352..8e8b4d778 100644 --- a/share/bootloaders/syslinux/splash.svg.in +++ b/share/bootloaders/syslinux/splash.svg.in @@ -244,7 +244,7 @@ x="190.68135" sodipodi:role="line" style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold" - id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan + id="tspan3041">@ARCHITECTURE@</tspan><tspan y="659.20679" x="190.68135" sodipodi:role="line" |
