Removing last live-helper remains in internal variables.
This commit is contained in:
Daniel Baumann
parent
34ae9036e6
commit
48f6f2105f
|
|
@ -15,7 +15,7 @@ Exit ()
|
||||||
if [ "${_DEBUG}" = "true" ]
|
if [ "${_DEBUG}" = "true" ]
|
||||||
then
|
then
|
||||||
# Dump variables
|
# Dump variables
|
||||||
set | grep -e ^LH
|
set | grep -e ^LB
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always exit true in case we are not able to unmount
|
# Always exit true in case we are not able to unmount
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/debian-forensics - package list for live-build(7)
|
# /usr/share/live/build/lists/debian-forensics - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Forensics
|
## LB: Debian Forensics
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
# http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
|
# http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/debian-junior - package list for live-build(7)
|
# /usr/share/live/build/lists/debian-junior - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Junior
|
## LB: Debian Junior
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
# http://qa.debian.org/developer.php?login=debian-jr@lists.debian.org
|
# http://qa.debian.org/developer.php?login=debian-jr@lists.debian.org
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/debian-live - package list for live-build(7)
|
# /usr/share/live/build/lists/debian-live - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Live
|
## LB: Debian Live
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
# http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
|
# http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/debian-live-pxe-server - package list for live-build(7)
|
# /usr/share/live/build/lists/debian-live-pxe-server - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Live
|
## LB: Debian Live
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
bind9
|
bind9
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/debian-science - package list for live-build(7)
|
# /usr/share/live/build/lists/debian-science - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Science
|
## LB: Debian Science
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
# http://qa.debian.org/developer.php?login=debian-science-maintainers@lists.alioth.debian.org
|
# http://qa.debian.org/developer.php?login=debian-science-maintainers@lists.alioth.debian.org
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnome - package list for live-build(7)
|
# /usr/share/live/build/lists/gnome - package list for live-build(7)
|
||||||
|
|
||||||
## LH: GNOME Desktop
|
## LB: GNOME Desktop
|
||||||
#include <gnome-core>
|
#include <gnome-core>
|
||||||
|
|
||||||
#if DISTRIBUTION lenny
|
#if DISTRIBUTION lenny
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnome-core - package list for live-build(7)
|
# /usr/share/live/build/lists/gnome-core - package list for live-build(7)
|
||||||
|
|
||||||
## LH: GNOME Core
|
## LB: GNOME Core
|
||||||
#include <standard-x11>
|
#include <standard-x11>
|
||||||
|
|
||||||
gnome-core
|
gnome-core
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnome-desktop - package list for live-build(7)
|
# /usr/share/live/build/lists/gnome-desktop - package list for live-build(7)
|
||||||
|
|
||||||
## LH: GNOME Desktop
|
## LB: GNOME Desktop
|
||||||
|
|
||||||
# This is a virtual package list, equivalent to:
|
# This is a virtual package list, equivalent to:
|
||||||
# lb config --packages-lists standard-x11 --tasks "gnome-desktop desktop standard laptop"
|
# lb config --packages-lists standard-x11 --tasks "gnome-desktop desktop standard laptop"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnome-full - package list for live-build(7)
|
# /usr/share/live/build/lists/gnome-full - package list for live-build(7)
|
||||||
|
|
||||||
## LH: GNOME full
|
## LB: GNOME full
|
||||||
#include <gnome>
|
#include <gnome>
|
||||||
|
|
||||||
gnome
|
gnome
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnome-junior - package list for live-build(7)
|
# /usr/share/live/build/lists/gnome-junior - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Debian Junior (Gnome)
|
## LB: Debian Junior (Gnome)
|
||||||
#include <gnome>
|
#include <gnome>
|
||||||
#include <debian-junior>
|
#include <debian-junior>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/gnustep - package list for live-build(7)
|
# /usr/share/live/build/lists/gnustep - package list for live-build(7)
|
||||||
|
|
||||||
## LH: GNUstep desktop
|
## LB: GNUstep desktop
|
||||||
#include <standard-x11>
|
#include <standard-x11>
|
||||||
|
|
||||||
wdm
|
wdm
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde - package list for live-build(7)
|
# /usr/share/live/build/lists/kde - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE
|
## LB: KDE
|
||||||
#include <kde-core>
|
#include <kde-core>
|
||||||
|
|
||||||
#if DISTRIBUTION lenny
|
#if DISTRIBUTION lenny
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde-core - package list for live-build(7)
|
# /usr/share/live/build/lists/kde-core - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE Core
|
## LB: KDE Core
|
||||||
#include <standard-x11>
|
#include <standard-x11>
|
||||||
|
|
||||||
#if DISTRIBUTION lenny
|
#if DISTRIBUTION lenny
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde-desktop - package list for live-build(7)
|
# /usr/share/live/build/lists/kde-desktop - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE Desktop
|
## LB: KDE Desktop
|
||||||
|
|
||||||
# This is a virtual package list, equivalent to:
|
# This is a virtual package list, equivalent to:
|
||||||
# lb config --packages-lists standard-x11 --tasks "kde-desktop desktop standard laptop"
|
# lb config --packages-lists standard-x11 --tasks "kde-desktop desktop standard laptop"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde-extra - package list for live-build(7)
|
# /usr/share/live/build/lists/kde-extra - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE Extra
|
## LB: KDE Extra
|
||||||
#include <kde-full>
|
#include <kde-full>
|
||||||
|
|
||||||
kde-extras
|
kde-extras
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde-full - package list for live-build(7)
|
# /usr/share/live/build/lists/kde-full - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE Full
|
## LB: KDE Full
|
||||||
#include <kde>
|
#include <kde>
|
||||||
|
|
||||||
#if DISTRIBUTION lenny
|
#if DISTRIBUTION lenny
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/kde-junior - package list for live-build(7)
|
# /usr/share/live/build/lists/kde-junior - package list for live-build(7)
|
||||||
|
|
||||||
## LH: KDE Junior
|
## LB: KDE Junior
|
||||||
#include <kde>
|
#include <kde>
|
||||||
#include <debian-junior>
|
#include <debian-junior>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/lxde - package list for live-build(7)
|
# /usr/share/live/build/lists/lxde - package list for live-build(7)
|
||||||
|
|
||||||
## LH: LXDE
|
## LB: LXDE
|
||||||
#include <standard-x11>
|
#include <standard-x11>
|
||||||
|
|
||||||
lxde
|
lxde
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/lxde-desktop - package list for live-build(7)
|
# /usr/share/live/build/lists/lxde-desktop - package list for live-build(7)
|
||||||
|
|
||||||
## LH: LXDE Desktop
|
## LB: LXDE Desktop
|
||||||
|
|
||||||
# This is a virtual package list, equivalent to:
|
# This is a virtual package list, equivalent to:
|
||||||
# lb config --packages-lists standard-x11 --tasks "lxde-desktop desktop standard laptop"
|
# lb config --packages-lists standard-x11 --tasks "lxde-desktop desktop standard laptop"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
# things to make the image smaller. This can lead to breakages at any time,
|
# things to make the image smaller. This can lead to breakages at any time,
|
||||||
# don't use it if you're not willing/capable of fixing any arising issues.
|
# don't use it if you're not willing/capable of fixing any arising issues.
|
||||||
|
|
||||||
## LH: Minimal
|
## LB: Minimal
|
||||||
|
|
||||||
eject file user-setup sudo
|
eject file user-setup sudo
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/rescue - package list for live-build(7)
|
# /usr/share/live/build/lists/rescue - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Rescue
|
## LB: Rescue
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
# Debian Forensics
|
# Debian Forensics
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/standard - package list for live-build(7)
|
# /usr/share/live/build/lists/standard - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Standard
|
## LB: Standard
|
||||||
#include <minimal>
|
#include <minimal>
|
||||||
|
|
||||||
console-setup console-common kbd
|
console-setup console-common kbd
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/standard-x11 - package list for live-build(7)
|
# /usr/share/live/build/lists/standard-x11 - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Standard X11
|
## LB: Standard X11
|
||||||
#include <standard>
|
#include <standard>
|
||||||
|
|
||||||
xorg xresprobe menu
|
xorg xresprobe menu
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/studio - package list for live-build(7)
|
# /usr/share/live/build/lists/studio - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Music Studio base
|
## LB: Music Studio base
|
||||||
# packagelist inspired from the A/DeMuDi one.
|
# packagelist inspired from the A/DeMuDi one.
|
||||||
#
|
#
|
||||||
# You don't want to use that list as a standalone list. Instead use
|
# You don't want to use that list as a standalone list. Instead use
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# /usr/share/live/build/lists/studio-gnome - package list for live-build(7)
|
# /usr/share/live/build/lists/studio-gnome - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Music Studio (Gnome)
|
## LB: Music Studio (Gnome)
|
||||||
#include <gnome>
|
#include <gnome>
|
||||||
#include <studio>
|
#include <studio>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# /usr/share/live/build/lists/studio-kde - package list for live-build(7)
|
# /usr/share/live/build/lists/studio-kde - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Music Studio (KDE)
|
## LB: Music Studio (KDE)
|
||||||
#include <kde>
|
#include <kde>
|
||||||
#include <studio>
|
#include <studio>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# /usr/share/live/build/lists/studio-xfce - package list for live-build(7)
|
# /usr/share/live/build/lists/studio-xfce - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Music Studio (Xfce)
|
## LB: Music Studio (Xfce)
|
||||||
#include <xfce>
|
#include <xfce>
|
||||||
#include <studio>
|
#include <studio>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/xfce - package list for live-build(7)
|
# /usr/share/live/build/lists/xfce - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Xfce
|
## LB: Xfce
|
||||||
#include <standard-x11>
|
#include <standard-x11>
|
||||||
|
|
||||||
xfce4
|
xfce4
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/xfce-desktop - package list for live-build(7)
|
# /usr/share/live/build/lists/xfce-desktop - package list for live-build(7)
|
||||||
|
|
||||||
## LH: XFCE Desktop
|
## LB: XFCE Desktop
|
||||||
|
|
||||||
# This is a virtual package list, equivalent to:
|
# This is a virtual package list, equivalent to:
|
||||||
# lb config --packages-lists standard-x11 --tasks "xfce-desktop desktop standard laptop"
|
# lb config --packages-lists standard-x11 --tasks "xfce-desktop desktop standard laptop"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# /usr/share/live/build/lists/xfce-junior - package list for live-build(7)
|
# /usr/share/live/build/lists/xfce-junior - package list for live-build(7)
|
||||||
|
|
||||||
## LH: Xfce Debian Junior
|
## LB: Xfce Debian Junior
|
||||||
#include <xfce>
|
#include <xfce>
|
||||||
#include <debian-junior>
|
#include <debian-junior>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,13 +44,13 @@ case "${1}" in
|
||||||
|
|
||||||
if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
|
if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
|
||||||
then
|
then
|
||||||
LH=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
|
LB=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
|
||||||
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
|
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
|
||||||
then
|
then
|
||||||
LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
|
LB=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
|
||||||
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
|
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
|
||||||
then
|
then
|
||||||
LH=1 exec "${COMMAND}" "${@}"
|
LB=1 exec "${COMMAND}" "${@}"
|
||||||
else
|
else
|
||||||
Echo_error "no such script"
|
Echo_error "no such script"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
||||||
|
|
@ -57,10 +57,10 @@ for ARGUMENT in ${ARGUMENTS}
|
||||||
do
|
do
|
||||||
case "${ARGUMENT}" in
|
case "${ARGUMENT}" in
|
||||||
--all)
|
--all)
|
||||||
LH=1 "${0}" noauto --chroot
|
LB=1 "${0}" noauto --chroot
|
||||||
LH=1 "${0}" noauto --binary
|
LB=1 "${0}" noauto --binary
|
||||||
LH=1 "${0}" noauto --stage
|
LB=1 "${0}" noauto --stage
|
||||||
LH=1 "${0}" noauto --source
|
LB=1 "${0}" noauto --source
|
||||||
|
|
||||||
rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
|
rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
|
||||||
;;
|
;;
|
||||||
|
|
@ -104,13 +104,13 @@ do
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--remove)
|
--remove)
|
||||||
LH=1 "${0}" --all
|
LB=1 "${0}" --all
|
||||||
rm -rf cache/packages_*
|
rm -rf cache/packages_*
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--purge)
|
--purge)
|
||||||
LH=1 "${0}" --all
|
LB=1 "${0}" --all
|
||||||
LH=1 "${0}" --cache
|
LB=1 "${0}" --cache
|
||||||
|
|
||||||
if [ -e auto/config ]
|
if [ -e auto/config ]
|
||||||
then
|
then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue