Switching back to use the more common ${@} instead of ${*}, it's not required in current lb_clean anymore.

This commit is contained in:
Daniel Baumann 2012-08-14 19:45:47 +02:00
parent dd31503960
commit 9820490ca6
8 changed files with 194 additions and 194 deletions

2
bin/lb
View File

@ -67,7 +67,7 @@ case "${1}" in
exit 1 exit 1
fi fi
Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}" Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${@}"
LB=1 ${ENV} exec "${SCRIPT}" "${@}" LB=1 ${ENV} exec "${SCRIPT}" "${@}"
;; ;;
esac esac

View File

@ -35,76 +35,76 @@ Set_defaults
Setup_cleanup Setup_cleanup
# Preparing root filesystem # Preparing root filesystem
lb binary_chroot ${*} lb binary_chroot ${@}
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then then
# Configuring chroot # Configuring chroot
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_sysv-rc install ${*} lb chroot_sysv-rc install ${@}
lb chroot_upstart install ${*} lb chroot_upstart install ${@}
lb chroot_apt install-binary ${*} lb chroot_apt install-binary ${@}
lb chroot_archives chroot install ${*} lb chroot_archives chroot install ${@}
fi fi
# Building root filesystem # Building root filesystem
lb binary_rootfs ${*} lb binary_rootfs ${@}
lb binary_manifest ${*} lb binary_manifest ${@}
# Prepare images # Prepare images
lb binary_package-lists ${*} lb binary_package-lists ${@}
lb binary_linux-image ${*} lb binary_linux-image ${@}
lb binary_debian-installer ${*} lb binary_debian-installer ${@}
lb binary_memtest ${*} lb binary_memtest ${@}
lb binary_grub ${*} lb binary_grub ${@}
lb binary_grub2 ${*} lb binary_grub2 ${@}
lb binary_syslinux ${*} lb binary_syslinux ${@}
lb binary_yaboot ${*} lb binary_yaboot ${@}
lb binary_silo ${*} lb binary_silo ${@}
lb binary_disk ${*} lb binary_disk ${@}
lb binary_win32-loader ${*} lb binary_win32-loader ${@}
lb binary_includes ${*} lb binary_includes ${@}
lb binary_hooks ${*} lb binary_hooks ${@}
lb binary_checksums ${*} lb binary_checksums ${@}
if [ "${LB_BUILD_WITH_CHROOT}" != "true" ] if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
then then
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
fi fi
# Building images # Building images
lb binary_iso ${*} lb binary_iso ${@}
lb binary_netboot ${*} lb binary_netboot ${@}
lb binary_tar ${*} lb binary_tar ${@}
lb binary_hdd ${*} lb binary_hdd ${@}
lb binary_virtual-hdd ${*} lb binary_virtual-hdd ${@}
lb binary_zsync ${*} lb binary_zsync ${@}
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then then
# Deconfiguring chroot # Deconfiguring chroot
rm -f .build/chroot_archives rm -f .build/chroot_archives
lb chroot_apt remove ${*} lb chroot_apt remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}
lb chroot_upstart remove ${*} lb chroot_upstart remove ${@}
lb chroot_sysv-rc remove ${*} lb chroot_sysv-rc remove ${@}
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${@}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${@}
fi fi
lb chroot_sysfs remove ${*} lb chroot_sysfs remove ${@}
lb chroot_selinuxfs remove ${*} lb chroot_selinuxfs remove ${@}
lb chroot_proc remove ${*} lb chroot_proc remove ${@}
lb chroot_devpts remove ${*} lb chroot_devpts remove ${@}

View File

@ -157,36 +157,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock rm -f .lock
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove ${*} lb chroot_archives binary remove ${@}
lb chroot_apt remove ${*} lb chroot_apt remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}
lb chroot_sysv-rc remove ${*} lb chroot_sysv-rc remove ${@}
lb chroot_upstart remove ${*} lb chroot_upstart remove ${@}
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${@}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${@}
lb chroot_sysfs remove ${*} lb chroot_sysfs remove ${@}
lb chroot_selinuxfs remove ${*} lb chroot_selinuxfs remove ${@}
lb chroot_proc remove ${*} lb chroot_proc remove ${@}
lb chroot_devpts remove ${*} lb chroot_devpts remove ${@}
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
lb chroot_debianchroot install ${*} lb chroot_debianchroot install ${@}
lb chroot_dpkg install ${*} lb chroot_dpkg install ${@}
lb chroot_sysv-rc install ${*} lb chroot_sysv-rc install ${@}
lb chroot_upstart install ${*} lb chroot_upstart install ${@}
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_apt install ${*} lb chroot_apt install ${@}
lb chroot_archives binary install ${*} lb chroot_archives binary install ${@}
touch .lock touch .lock
else else
@ -247,36 +247,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock rm -f .lock
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove ${*} lb chroot_archives binary remove ${@}
lb chroot_apt remove ${*} lb chroot_apt remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}
lb chroot_sysv-rc remove ${*} lb chroot_sysv-rc remove ${@}
lb chroot_upstart remove ${*} lb chroot_upstart remove ${@}
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${@}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${@}
lb chroot_sysfs remove ${*} lb chroot_sysfs remove ${@}
lb chroot_selinuxfs remove ${*} lb chroot_selinuxfs remove ${@}
lb chroot_proc remove ${*} lb chroot_proc remove ${@}
lb chroot_devpts remove ${*} lb chroot_devpts remove ${@}
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
lb chroot_debianchroot install ${*} lb chroot_debianchroot install ${@}
lb chroot_dpkg install ${*} lb chroot_dpkg install ${@}
lb chroot_sysv-rc install ${*} lb chroot_sysv-rc install ${@}
lb chroot_upstart install ${*} lb chroot_upstart install ${@}
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_apt install ${*} lb chroot_apt install ${@}
lb chroot_archives binary install ${*} lb chroot_archives binary install ${@}
touch .lock touch .lock
else else
@ -397,36 +397,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock rm -f .lock
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove ${*} lb chroot_archives binary remove ${@}
lb chroot_apt remove ${*} lb chroot_apt remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}
lb chroot_sysv-rc remove ${*} lb chroot_sysv-rc remove ${@}
lb chroot_upstart remove ${*} lb chroot_upstart remove ${@}
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${@}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${@}
lb chroot_sysfs remove ${*} lb chroot_sysfs remove ${@}
lb chroot_selinuxfs remove ${*} lb chroot_selinuxfs remove ${@}
lb chroot_proc remove ${*} lb chroot_proc remove ${@}
lb chroot_devpts remove ${*} lb chroot_devpts remove ${@}
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
lb chroot_debianchroot install ${*} lb chroot_debianchroot install ${@}
lb chroot_dpkg install ${*} lb chroot_dpkg install ${@}
lb chroot_sysv-rc install ${*} lb chroot_sysv-rc install ${@}
lb chroot_upstart install ${*} lb chroot_upstart install ${@}
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_apt install ${*} lb chroot_apt install ${@}
lb chroot_archives binary install ${*} lb chroot_archives binary install ${@}
touch .lock touch .lock
else else

View File

@ -35,11 +35,11 @@ Set_defaults
Setup_cleanup Setup_cleanup
# Bootstrapping system # Bootstrapping system
lb bootstrap_cache restore ${*} lb bootstrap_cache restore ${@}
lb bootstrap_copy ${*} lb bootstrap_copy ${@}
lb bootstrap_cdebootstrap ${*} lb bootstrap_cdebootstrap ${@}
lb bootstrap_debootstrap ${*} lb bootstrap_debootstrap ${@}
lb bootstrap_cache save ${*} lb bootstrap_cache save ${@}
# Temporary hack until we have multistrap in place # Temporary hack until we have multistrap in place
case "${LB_MODE}" in case "${LB_MODE}" in

View File

@ -65,13 +65,13 @@ Set_defaults
Check_defaults Check_defaults
# Bootstrapping system # Bootstrapping system
lb bootstrap ${*} lb bootstrap ${@}
# Customizing chroot # Customizing chroot
lb chroot ${*} lb chroot ${@}
# Building binary images # Building binary images
lb binary ${*} lb binary ${@}
# Building source images # Building source images
lb source ${*} lb source ${@}

View File

@ -35,30 +35,30 @@ Set_defaults
Setup_cleanup Setup_cleanup
# Configuring chroot # Configuring chroot
lb chroot_cache restore ${*} lb chroot_cache restore ${@}
lb chroot_devpts install ${*} lb chroot_devpts install ${@}
lb chroot_proc install ${*} lb chroot_proc install ${@}
lb chroot_selinuxfs install ${*} lb chroot_selinuxfs install ${@}
lb chroot_sysfs install ${*} lb chroot_sysfs install ${@}
lb chroot_debianchroot install ${*} lb chroot_debianchroot install ${@}
lb chroot_dpkg install ${*} lb chroot_dpkg install ${@}
lb chroot_tmpfs install ${*} lb chroot_tmpfs install ${@}
lb chroot_sysv-rc install ${*} lb chroot_sysv-rc install ${@}
lb chroot_upstart install ${*} lb chroot_upstart install ${@}
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_apt install ${*} lb chroot_apt install ${@}
lb chroot_archives chroot install ${*} lb chroot_archives chroot install ${@}
# Customizing chroot # Customizing chroot
lb chroot_linux-image ${*} lb chroot_linux-image ${@}
lb chroot_preseed ${*} lb chroot_preseed ${@}
for _PASS in install live for _PASS in install live
do do
lb chroot_package-lists ${_PASS} ${*} lb chroot_package-lists ${_PASS} ${@}
lb chroot_install-packages ${_PASS} ${*} lb chroot_install-packages ${_PASS} ${@}
if [ "${_PASS}" = install ] if [ "${_PASS}" = install ]
then then
@ -66,27 +66,27 @@ do
fi fi
done done
lb chroot_live-packages ${*} lb chroot_live-packages ${@}
lb chroot_includes ${*} lb chroot_includes ${@}
lb chroot_hooks ${*} lb chroot_hooks ${@}
lb chroot_hacks ${*} lb chroot_hacks ${@}
lb chroot_interactive ${*} lb chroot_interactive ${@}
Chroot chroot "dpkg-query -W" > chroot.packages.live Chroot chroot "dpkg-query -W" > chroot.packages.live
# Deconfiguring chroot # Deconfiguring chroot
lb chroot_archives chroot remove ${*} lb chroot_archives chroot remove ${@}
lb chroot_apt remove ${*} lb chroot_apt remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}
lb chroot_sysv-rc remove ${*} lb chroot_sysv-rc remove ${@}
lb chroot_upstart remove ${*} lb chroot_upstart remove ${@}
lb chroot_tmpfs remove ${*} lb chroot_tmpfs remove ${@}
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${@}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${@}
lb chroot_sysfs remove ${*} lb chroot_sysfs remove ${@}
lb chroot_selinuxfs remove ${*} lb chroot_selinuxfs remove ${@}
lb chroot_proc remove ${*} lb chroot_proc remove ${@}
lb chroot_devpts remove ${*} lb chroot_devpts remove ${@}
lb chroot_cache save ${*} lb chroot_cache save ${@}

View File

@ -46,7 +46,7 @@ fi
rm -f .lock rm -f .lock
if [ -z "${*}" ] if [ -z "${@}" ]
then then
ARGUMENTS="--all" ARGUMENTS="--all"
else else

View File

@ -42,25 +42,25 @@ fi
Setup_cleanup Setup_cleanup
# Enabling network in chroot # Enabling network in chroot
lb chroot_hosts install ${*} lb chroot_hosts install ${@}
lb chroot_resolv install ${*} lb chroot_resolv install ${@}
lb chroot_hostname install ${*} lb chroot_hostname install ${@}
lb chroot_archives source install ${*} lb chroot_archives source install ${@}
# Preparing images # Preparing images
lb source_debian-live ${*} lb source_debian-live ${@}
lb source_debian ${*} lb source_debian ${@}
lb source_disk ${*} lb source_disk ${@}
lb source_checksums ${*} lb source_checksums ${@}
# Building images # Building images
lb source_iso ${*} lb source_iso ${@}
lb source_tar ${*} lb source_tar ${@}
lb source_hdd ${*} lb source_hdd ${@}
lb source_virtual-hdd ${*} lb source_virtual-hdd ${@}
# Deconfiguring chroot # Deconfiguring chroot
lb chroot_archives chroot remove ${*} lb chroot_archives chroot remove ${@}
lb chroot_hostname remove ${*} lb chroot_hostname remove ${@}
lb chroot_resolv remove ${*} lb chroot_resolv remove ${@}
lb chroot_hosts remove ${*} lb chroot_hosts remove ${@}