diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-26 12:38:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:19:23 +0100 |
| commit | c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a (patch) | |
| tree | 44a6d3a12cd11067aea2a4d43eb9133cc25bad2f /scripts | |
| parent | 941a47be0ca3061f54a237583092357d1ff80f7c (diff) | |
| download | vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.tar.gz vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.zip | |
Adding debian version 3.0~a1-1.
Diffstat (limited to 'scripts')
81 files changed, 259 insertions, 307 deletions
diff --git a/scripts/build/lb b/scripts/build/lb index 58c1d12d5..d0b10f73e 100755 --- a/scripts/build/lb +++ b/scripts/build/lb @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -22,7 +22,7 @@ case "${1}" in -h|--help) if [ -x "$(which man 2>/dev/null)" ] then - man lb + man lh exit 0 else ${0} --usage @@ -44,13 +44,13 @@ case "${1}" in if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ] then - LB=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}" + LH=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}" elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ] then - LB=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}" + LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}" elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] then - LB=1 exec "${COMMAND}" "${@}" + LH=1 exec "${COMMAND}" "${@}" else Echo_error "no such script" exit 1 diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index 27921f2b7..8598e3ed6 100755 --- a/scripts/build/lb_binary +++ b/scripts/build/lb_binary @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums index d900a2c50..a45f1a392 100755 --- a/scripts/build/lb_binary_checksums +++ b/scripts/build/lb_binary_checksums @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot index 3ce9708b9..46e452405 100755 --- a/scripts/build/lb_binary_chroot +++ b/scripts/build/lb_binary_chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index ee7bb64a0..e1b7b0940 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -328,7 +328,7 @@ then case "${LB_MODE}" in ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic" ;; *) @@ -343,7 +343,7 @@ then case "${LB_MODE}" in ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic" ;; *) @@ -354,28 +354,12 @@ then sparc) DI_REQ_PACKAGES="silo" - case "${LB_MODE}" in - ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp" - ;; - esac + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp" ;; powerpc) DI_REQ_PACKAGES="yaboot" - case "${LB_MODE}" in - ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp" - ;; - esac + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp" ;; esac @@ -383,17 +367,8 @@ then case "${LB_MODE}" in debian) - case "${LB_DISTRIBUTION}" in - lenny) - DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup kbd" - DI_PACKAGES="${DI_PACKAGES} console-setup kbd" - ;; - - *) - DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd" - DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd" - ;; - esac + DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd" + DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd" ;; esac @@ -429,7 +404,6 @@ then # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_REQ_PACKAGES} - Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} else # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} @@ -613,25 +587,13 @@ then # Generating release file mv binary chroot/root - eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" - - case "${LB_DISTRIBUTION}" in - sid) - _SUITE="unstable" - ;; - - *) - _SUITE="${LB_DISTRIBUTION}" - ;; - esac - cat > chroot/binary.sh << EOF cd /root/binary && apt-ftparchive \ -o APT::FTPArchive::Release::Origin="Debian" \ -o APT::FTPArchive::Release::Label="Debian" \ - -o APT::FTPArchive::Release::Suite="${_SUITE}" \ - -o APT::FTPArchive::Release::Version="${_VERSION}" \ - -o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \ + -o APT::FTPArchive::Release::Suite="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \ + -o APT::FTPArchive::Release::Version="4.0" \ + -o APT::FTPArchive::Release::Codename="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \ -o APT::FTPArchive::Release::Components="main" \ @@ -643,33 +605,17 @@ EOF rm -f chroot/binary.sh mv chroot/root/binary ./ - DISTRIBUTIONS="frozen stable testing unstable" - - if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_DISTRIBUTION}" ] - then - DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_DISTRIBUTION}" - fi + # Creating dist symlinks + for DISTRIBUTION in frozen stable testing unstable + do + ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} + done case "${LB_BINARY_IMAGES}" in - usb-hdd) - case "${LB_BINARY_FILESYSTEM}" in - fat*) - # Creating dist directories - for DISTRIBUTION in ${DISTRIBUTIONS} - do - cp -a binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} - done - ;; - esac + usb*) ;; *) - # Creating dist symlinks - for DISTRIBUTION in ${DISTRIBUTIONS} - do - ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} - done - ln -s . binary/debian ;; esac diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk index fe68a7d08..7a15c8d38 100755 --- a/scripts/build/lb_binary_disk +++ b/scripts/build/lb_binary_disk @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_encryption b/scripts/build/lb_binary_encryption index 2508e85d6..f5e645850 100755 --- a/scripts/build/lb_binary_encryption +++ b/scripts/build/lb_binary_encryption @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index 9319bfa8e..efd16ea80 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 6ad8c3cd6..591b5f112 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes index 72c29f5bc..43c7a9930 100755 --- a/scripts/build/lb_binary_includes +++ b/scripts/build/lb_binary_includes @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index 0394d3654..50ed78100 100755 --- a/scripts/build/lb_binary_iso +++ b/scripts/build/lb_binary_iso @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -156,18 +156,6 @@ fi if [ "${LB_BOOTLOADER}" = "grub2" ] then - case "${LB_DISTRIBUTION}" in - lenny|lucid) - GRUB_MKIMAGE_OPTIONS="" - ;; - - *) - # grub >= 1.98+20100527 requires -O, see #584415 - GRUB_MKIMAGE_OPTIONS="-O i386-pc" - ;; - - esac - cat > binary.sh << EOF #!/bin/sh @@ -175,7 +163,7 @@ input_dir=/usr/lib/grub/i386-pc # build core.img core_img=\$(mktemp) -grub-mkimage -d \${input_dir} -o \${core_img} ${GRUB_MKIMAGE_OPTIONS} biosdisk iso9660 +grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660 # build grub_eltorito image cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image index b9a1f1bc4..729b1600c 100755 --- a/scripts/build/lb_binary_linux-image +++ b/scripts/build/lb_binary_linux-image @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_local-hooks b/scripts/build/lb_binary_local-hooks index 729200db4..50aaae2a6 100755 --- a/scripts/build/lb_binary_local-hooks +++ b/scripts/build/lb_binary_local-hooks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes index 627e683a5..2fee3e4b2 100755 --- a/scripts/build/lb_binary_local-includes +++ b/scripts/build/lb_binary_local-includes @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_local-packageslists b/scripts/build/lb_binary_local-packageslists index a9fe1b3c2..80f3fb257 100755 --- a/scripts/build/lb_binary_local-packageslists +++ b/scripts/build/lb_binary_local-packageslists @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index 6037a1eb5..1c50f5804 100755 --- a/scripts/build/lb_binary_manifest +++ b/scripts/build/lb_binary_manifest @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest index 117ad638a..01b301d20 100755 --- a/scripts/build/lb_binary_memtest +++ b/scripts/build/lb_binary_memtest @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net index 7d2ee953e..077a0237c 100755 --- a/scripts/build/lb_binary_net +++ b/scripts/build/lb_binary_net @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 66b970c77..27af0993a 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -307,16 +307,7 @@ case "${LB_CHROOT_FILESYSTEM}" in if [ -f config/binary_rootfs/squashfs.sort ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort" - - case "${LB_BUILD_WITH_CHROOT}" in - true) - cp config/binary_rootfs/squashfs.sort chroot - ;; - - false) - cp config/binary_rootfs/squashfs.sort . - ;; - esac + cp config/binary_rootfs/squashfs.sort chroot #FIXME fi case "${LB_BUILD_WITH_CHROOT}" in diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 2ffef0202..7c0c6aea7 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index fa4d96320..9a96c5df1 100755 --- a/scripts/build/lb_binary_syslinux +++ b/scripts/build/lb_binary_syslinux @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -95,28 +95,27 @@ Syslinux_live_entry () case "${LB_BINARY_IMAGES}" in iso*|usb*) - if [ "${LABEL}" = "live" ] + NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz-' | wc -l)" + + # Do not add numbering to filenames if first kernel/initrd + if [ "${NUMBER}" = "2" ] then - # Do not number the default kernel / initrd files. - _NUMBER="" - else - # Use order of flavours in LB_LINUX_FLAVOURS for numbering. - _NUMBER="$(echo ${LB_LINUX_FLAVOURS} | awk -v FLAVOUR="${FLAVOUR}" 'BEGIN{RS=" "} {if($1 == FLAVOUR) print NR}')" + NUMBER="" fi + # Note: ISOLINUX will not find the kernel if the name ends in ".img". if [ -e ${KERNEL_PATH}/${KERNEL} ] then - # Note: ISOLINUX will not find the kernel if the name ends in ".img". - mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${_NUMBER} + mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER} fi if [ -e ${KERNEL_PATH}/${INITRD} ] then - mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${_NUMBER}.img + mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img fi - KERNEL=vmlinuz${_NUMBER} - INITRD=initrd${_NUMBER}.img + KERNEL=vmlinuz${NUMBER} + INITRD=initrd${NUMBER}.img ;; esac diff --git a/scripts/build/lb_binary_tar b/scripts/build/lb_binary_tar index ae05389b4..3e89bd74f 100755 --- a/scripts/build/lb_binary_tar +++ b/scripts/build/lb_binary_tar @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb index 5b3c64530..ae78e7b53 100755 --- a/scripts/build/lb_binary_usb +++ b/scripts/build/lb_binary_usb @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd index d24f9f329..c2bc5db05 100755 --- a/scripts/build/lb_binary_virtual-hdd +++ b/scripts/build/lb_binary_virtual-hdd @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader index 1bc3476a2..d3a8bd8c6 100755 --- a/scripts/build/lb_binary_win32-loader +++ b/scripts/build/lb_binary_win32-loader @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -45,20 +45,10 @@ Create_lockfile .lock case "${LB_ARCHITECTURE}" in amd64|i386) - case "${LB_DISTRIBUTION}" in - lenny) - WIN32_LOADER="/usr/lib/win32-loader" - ;; - - *) - WIN32_LOADER="/usr/share/win32" - ;; - esac - if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Checking depends - Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader + Check_package chroot/usr/share/win32/win32-loader.exe win32-loader # Restoring cache Restore_cache cache/packages_binary @@ -67,9 +57,9 @@ case "${LB_ARCHITECTURE}" in Install_package # Copying win32-loader - cp -r chroot/${WIN32_LOADER}/* binary + cp -r chroot/usr/share/win32/* binary else - cp -r ${WIN32_LOADER}/* binary + cp -r usr/share/win32/* binary fi mv binary/win32-loader.exe binary/setup.exe diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index 16ab4de07..1e7fa9522 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap index 5741d413e..323960023 100755 --- a/scripts/build/lb_bootstrap +++ b/scripts/build/lb_bootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache index 62962f575..96cac1762 100755 --- a/scripts/build/lb_bootstrap_cache +++ b/scripts/build/lb_bootstrap_cache @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index d9e9b7208..d7724d7c4 100755 --- a/scripts/build/lb_bootstrap_cdebootstrap +++ b/scripts/build/lb_bootstrap_cdebootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/lb_bootstrap_copy index 24a51915e..35d1378f0 100755 --- a/scripts/build/lb_bootstrap_copy +++ b/scripts/build/lb_bootstrap_copy @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index 57caf303d..2e68a0e48 100755 --- a/scripts/build/lb_bootstrap_debootstrap +++ b/scripts/build/lb_bootstrap_debootstrap @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -55,13 +55,13 @@ mkdir -p chroot # Setting debootstrap options if [ -n "${LB_ARCHITECTURE}" ] then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LB_ARCHITECTURE}" fi if [ "${LB_ARCHIVE_AREAS}" != "main" ] then # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi if [ -n "${LB_BOOTSTRAP_CONFIG}" ] diff --git a/scripts/build/lb_build b/scripts/build/lb_build index 16f1da2ea..332ca5576 100755 --- a/scripts/build/lb_build +++ b/scripts/build/lb_build @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -24,7 +24,7 @@ fi if [ "${1}" != "noauto" ] && [ -x auto/build ] then Echo_message "Executing auto/build script." - ./auto/build "${@}" + ./auto/build ${@} exit ${?} fi diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index 1dce44fe2..09e18757a 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -42,6 +42,7 @@ lb chroot_selinuxfs install ${*} lb chroot_sysfs install ${*} lb chroot_debianchroot install ${*} lb chroot_dpkg install ${*} +lb chroot_dpkg_tmpfs install ${*} lb chroot_sysv-rc install ${*} lb chroot_upstart install ${*} lb chroot_hosts install ${*} @@ -79,6 +80,7 @@ lb chroot_resolv remove ${*} lb chroot_hosts remove ${*} lb chroot_sysv-rc remove ${*} lb chroot_upstart remove ${*} +lb chroot_dpkg_tmpfs remove ${*} lb chroot_dpkg remove ${*} lb chroot_debianchroot remove ${*} lb chroot_sysfs remove ${*} diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index e60e60a36..3a2152594 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -122,7 +122,7 @@ case "${1}" in if Find_files config/chroot_local-packages/*.deb then echo >> chroot/etc/apt/preferences - echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences + echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences echo "Package: *" >> chroot/etc/apt/preferences echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences @@ -133,7 +133,7 @@ case "${1}" in ;; install-binary) - # Ensure local packages are not re-installed during lb_binary + # Ensure local packages are not re-installed during lh_binary echo "Pin-Priority: 99" >> chroot/etc/apt/preferences echo >> chroot/etc/apt/preferences @@ -220,8 +220,8 @@ case "${1}" in then if [ -f chroot/etc/apt/preferences ] then - # delete additions from lb_chroot_apt install|install-binary to preferences - sed -i '/# Added by lb_chroot_apt/,$d' chroot/etc/apt/preferences + # delete additions from lh_chroot_apt install|install-binary to preferences + sed -i '/# Added by lh_chroot_apt/,$d' chroot/etc/apt/preferences # delete the last empty line sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences # if the resulting preferences file is empty there was no user additions, remove it diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache index bca88cd75..5050b328b 100755 --- a/scripts/build/lb_chroot_cache +++ b/scripts/build/lb_chroot_cache @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/lb_chroot_debianchroot index 872dc45fb..dc051115d 100755 --- a/scripts/build/lb_chroot_debianchroot +++ b/scripts/build/lb_chroot_debianchroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts index 7ba16aad6..8e7e665cc 100755 --- a/scripts/build/lb_chroot_devpts +++ b/scripts/build/lb_chroot_devpts @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg index 64c808526..ec856ed3e 100755 --- a/scripts/build/lb_chroot_dpkg +++ b/scripts/build/lb_chroot_dpkg @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_dpkg_tmpfs b/scripts/build/lb_chroot_dpkg_tmpfs new file mode 100755 index 000000000..db3b8bf68 --- /dev/null +++ b/scripts/build/lb_chroot_dpkg_tmpfs @@ -0,0 +1,75 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> +## +## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +## This is free software, and you are welcome to redistribute it +## under certain conditions; see COPYING for details. + + +set -e + +# Including common functions +. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh + +# Setting static variables +DESCRIPTION="$(Echo 'manage /var/lib/dpkg')" +HELP="" +USAGE="${PROGRAM} {install|remove} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source +Set_defaults + +# Requiring stage file +Require_stagefile .stage/config .stage/bootstrap + +case "${1}" in + install) + Echo_message "Configuring tmpfs for /var/lib/dpkg" + + # Checking stage file + Check_stagefile .stage/chroot_dpkg_tmpfs + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + mv chroot/var/lib/dpkg chroot/var/lib/dpkg.tmp + mkdir chroot/var/lib/dpkg + mount -t tmpfs tmpfs chroot/var/lib/dpkg + mv chroot/var/lib/dpkg.tmp/* chroot/var/lib/dpkg + rm -rf chroot/var/lib/dpkg.tmp + + # Creating stage file + Create_stagefile .stage/chroot_dpkg_tmpfs + ;; + + remove) + Echo_message "Deconfiguring tmpfs for /var/lib/dpkg" + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + mkdir -p chroot/var/lib/dpkg.tmp + mv chroot/var/lib/dpkg/* chroot/var/lib/dpkg.tmp + umount chroot/var/lib/dpkg + rm -rf chroot/var/lib/dpkg + mv chroot/var/lib/dpkg.tmp chroot/var/lib/dpkg + + # Removing stage file + rm -f .stage/chroot_dpkg_tmpfs + ;; + + *) + Usage + ;; +esac diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index b78ba3ab2..47124bedc 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -40,8 +40,7 @@ Create_lockfile .lock case "${LB_DISTRIBUTION}" in squeeze|sid) - if echo "${LB_TASKS}" | grep -qs lxde || - echo "${LB_TASKS}" | grep -qs xfce + if echo "${LB_TASKS}" | grep -qs lxde then GDM="gdm" else @@ -129,7 +128,8 @@ done # Removing openssh-server hostkeys, # they are regenerated by live-config. -rm -f chroot/etc/ssh/ssh_host_*_key chroot/etc/ssh/ssh_host_*_key.pub +#rm -f chroot/etc/ssh/ssh_host_dsa_key chroot/etc/ssh/ssh_host_dsa_key.pub +#rm -f chroot/etc/ssh/ssh_host_rsa_key chroot/etc/ssh/ssh_host_rsa_key.pub # Removing udev mac caching rule rm -f chroot/etc/udev/rules.d/*persistent-net.rules @@ -211,7 +211,7 @@ fi if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then # This is a temporary hack to get rid of fstab; - # needs cleanup in live-initramfs first to proper fix. + # needs cleanup in live-boot first to proper fix. rm -f chroot/etc/fstab fi diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks index 71d5d7bcd..ed40b18c0 100755 --- a/scripts/build/lb_chroot_hooks +++ b/scripts/build/lb_chroot_hooks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname index 81bf4c3f4..a39109915 100755 --- a/scripts/build/lb_chroot_hostname +++ b/scripts/build/lb_chroot_hostname @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/lb_chroot_hosts index f246b5351..b8c50e723 100755 --- a/scripts/build/lb_chroot_hosts +++ b/scripts/build/lb_chroot_hosts @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages index a0e2684d2..8e1217e48 100755 --- a/scripts/build/lb_chroot_install-packages +++ b/scripts/build/lb_chroot_install-packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/lb_chroot_interactive index 989b37966..82e5a6c4b 100755 --- a/scripts/build/lb_chroot_interactive +++ b/scripts/build/lb_chroot_interactive @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -59,4 +59,4 @@ case "${LB_INTERACTIVE}" in esac # Creating stage file -Create_stagefile .stage/chroot_interactive +Create_stagefile .stage/chroot_symlinks diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 1e3cefbdf..507f3859d 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-hooks b/scripts/build/lb_chroot_local-hooks index c163ca3a1..de65bba10 100755 --- a/scripts/build/lb_chroot_local-hooks +++ b/scripts/build/lb_chroot_local-hooks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-includes b/scripts/build/lb_chroot_local-includes index d2c0f8a2f..78c19de15 100755 --- a/scripts/build/lb_chroot_local-includes +++ b/scripts/build/lb_chroot_local-includes @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-packages b/scripts/build/lb_chroot_local-packages index bca5c5ede..aa44179f7 100755 --- a/scripts/build/lb_chroot_local-packages +++ b/scripts/build/lb_chroot_local-packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-packageslists b/scripts/build/lb_chroot_local-packageslists index d86f7d46e..ab7e5f20a 100755 --- a/scripts/build/lb_chroot_local-packageslists +++ b/scripts/build/lb_chroot_local-packageslists @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-patches b/scripts/build/lb_chroot_local-patches index b695e633b..da8b88e5a 100755 --- a/scripts/build/lb_chroot_local-patches +++ b/scripts/build/lb_chroot_local-patches @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_local-preseed b/scripts/build/lb_chroot_local-preseed index d37f5ebc7..fa259da70 100755 --- a/scripts/build/lb_chroot_local-preseed +++ b/scripts/build/lb_chroot_local-preseed @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_localization b/scripts/build/lb_chroot_localization index 5e4b98322..6aded7a12 100755 --- a/scripts/build/lb_chroot_localization +++ b/scripts/build/lb_chroot_localization @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -612,12 +612,7 @@ then Check_installed chroot/usr/bin/icedove icedove if [ $INSTALL_STATUS -eq 0 ] then - if [ "${LB_DISTRIBUTION}" = lenny ] - then - Check_package "" icedove-locale-"${ICEDOVE}" - else - Check_package "" icedove-l10n-"${ICEDOVE}" - fi + Check_package "" icedove-l10n-"${ICEDOVE}" fi ;; @@ -639,11 +634,6 @@ then esac done - if [ "${LB_DISTRIBUTION}" = "lenny" ] - then - Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n - fi - Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n # Restoring cache diff --git a/scripts/build/lb_chroot_packages b/scripts/build/lb_chroot_packages index 174a9aab5..dbf873a62 100755 --- a/scripts/build/lb_chroot_packages +++ b/scripts/build/lb_chroot_packages @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_packageslists b/scripts/build/lb_chroot_packageslists index 34338cb82..bd2ba24dc 100755 --- a/scripts/build/lb_chroot_packageslists +++ b/scripts/build/lb_chroot_packageslists @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed index fe47ccd75..22bfe7a10 100755 --- a/scripts/build/lb_chroot_preseed +++ b/scripts/build/lb_chroot_preseed @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_proc b/scripts/build/lb_chroot_proc index 57ba5cf45..4af28ad54 100755 --- a/scripts/build/lb_chroot_proc +++ b/scripts/build/lb_chroot_proc @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv index 1e705dcfc..d1c376694 100755 --- a/scripts/build/lb_chroot_resolv +++ b/scripts/build/lb_chroot_resolv @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/lb_chroot_selinuxfs index 1d7bd0a24..0f30d3b5e 100755 --- a/scripts/build/lb_chroot_selinuxfs +++ b/scripts/build/lb_chroot_selinuxfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index 2bb05ec60..60654dc4d 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -88,25 +88,15 @@ EOF then case "${LB_MODE}" in debian|debian-release) - case "${LB_DISTRIBUTION}" in - lenny) - echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - - squeeze) - echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] + then + echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi + fi ;; ubuntu) @@ -161,14 +151,6 @@ EOF then for REPOSITORY in ${LB_REPOSITORIES} do - # ubuntu workaround to allow using live.debian.net - if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ] - then - _DISTRIBUTION="sid" - else - _DISTRIBUTION="${LB_DISTRIBUTION}" - fi - for PLACE in config/repositories "${LB_BASE}/repositories" do # Prefer repositories from the config tree @@ -181,13 +163,13 @@ EOF # Adding sources.list entries (chroot) if [ -e "${PLACE}/${REPOSITORY}.chroot" ] then - sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ "${PLACE}/${REPOSITORY}.chroot" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" elif [ -e "${PLACE}/${REPOSITORY}" ] then - sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ "${PLACE}/${REPOSITORY}" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" @@ -542,25 +524,15 @@ EOF then case "${LB_MODE}" in debian|debian-release) - case "${LB_DISTRIBUTION}" in - lenny) - echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - - squeeze) - echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] + then + echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi + fi ;; ubuntu) diff --git a/scripts/build/lb_chroot_symlinks b/scripts/build/lb_chroot_symlinks index 3dee96e80..b9150bbe5 100755 --- a/scripts/build/lb_chroot_symlinks +++ b/scripts/build/lb_chroot_symlinks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/lb_chroot_sysfs index fd177436d..09f26432f 100755 --- a/scripts/build/lb_chroot_sysfs +++ b/scripts/build/lb_chroot_sysfs @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc index 582927553..f19b8f75f 100755 --- a/scripts/build/lb_chroot_sysv-rc +++ b/scripts/build/lb_chroot_sysv-rc @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_sysvinit b/scripts/build/lb_chroot_sysvinit index 0d45836d9..d4dc0a405 100755 --- a/scripts/build/lb_chroot_sysvinit +++ b/scripts/build/lb_chroot_sysvinit @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_tasks b/scripts/build/lb_chroot_tasks index 72db9f6c0..4a8081e8f 100755 --- a/scripts/build/lb_chroot_tasks +++ b/scripts/build/lb_chroot_tasks @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart index bc24c2e01..7a4b6916c 100755 --- a/scripts/build/lb_chroot_upstart +++ b/scripts/build/lb_chroot_upstart @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index d690a3aec..f0e43a54b 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -17,7 +17,7 @@ set -e if [ "${1}" != "noauto" ] && [ -x auto/clean ] then Echo_message "Executing auto/clean script." - ./auto/clean "${@}" + ./auto/clean ${@} exit ${?} fi @@ -57,10 +57,10 @@ for ARGUMENT in ${ARGUMENTS} do case "${ARGUMENT}" in --all) - LB=1 "${0}" noauto --chroot - LB=1 "${0}" noauto --binary - LB=1 "${0}" noauto --stage - LB=1 "${0}" noauto --source + LH=1 "${0}" noauto --chroot + LH=1 "${0}" noauto --binary + LH=1 "${0}" noauto --stage + LH=1 "${0}" noauto --source rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true ;; @@ -104,13 +104,13 @@ do ;; --remove) - LB=1 "${0}" --all + LH=1 "${0}" --all rm -rf cache/packages_* ;; --purge) - LB=1 "${0}" --all - LB=1 "${0}" --cache + LH=1 "${0}" --all + LH=1 "${0}" --cache if [ -e auto/config ] then diff --git a/scripts/build/lb_config b/scripts/build/lb_config index ac6beb0f3..f46b82932 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -17,7 +17,7 @@ set -e if [ "${1}" != "noauto" ] && [ -x auto/config ] then Echo_message "Executing auto/config script." - ./auto/config "${@}" + ./auto/config ${@} exit ${?} fi @@ -27,20 +27,19 @@ then fi # Setting static variables -PROGRAM="lb config" DESCRIPTION="$(Echo 'create configuration for live-build(7)')" -USAGE="${PROGRAM} [--apt apt|aptitude]\n\ +USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--apt-ftp-proxy URL]\n\ \t [--apt-http-proxy URL]\n\ \t [--apt-pdiffs true|false]\n\ \t [--apt-options OPTION|\"OPTIONS\"]\n\ \t [--aptitude-options OPTION|\"OPTIONS\"]\n\ -\t [--apt-pipeline DEPTH]\n\ +\t [--apt-pipeline FIXME]\n\ \t [--apt-recommends true|false]\n\ \t [--apt-secure true|false]\n\ \t [-a|--architecture ARCHITECTURE]\n\ -\t [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\ -\t [--binary-filesystem fat16|fat32|ext2]\n\ +\t [-b|--binary-images iso|net|tar|usb-hdd]\n\ +\t [--binary-filesystem fat16|fat32]\n\ \t [--binary-indices true|false|none]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ @@ -49,6 +48,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootstrap-config FILE]\n\ \t [-f|--bootstrap-flavour minimal|standard]\n\ \t [--bootstrap-keyring PACKAGE]\n\ +\t [--breakpoints]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ \t [--cache-packages true|false]\n\ @@ -56,13 +56,13 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--checksums md5|sha1|sha256|none]\n\ \t [--build-with-chroot true|false]\n\ \t [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\ -\t [--clean]\n\ \t [-c|--conffile FILE]\n\ +\t [--clean\n\ \t [--debconf-frontend dialog|editor|noninteractive|readline]\n\ \t [--debconf-nowarnings true|false]\n\ \t [--debconf-priority low|medium|high|critical]\n\ \t [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\ -\t [--debian-installer-distribution daily|CODENAME]\n\ +\t [--debian-installer-distribution CODENAME|daily]\n\ \t [--debian-installer-preseedfile FILE|URL]\n\ \t [--debian-installer-gui true|false]\n\ \t [--debug]\n\ @@ -76,8 +76,8 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--hooks FILE]\n\ \t [--hostname NAME]\n\ \t [--ignore-system-defaults]\n\ -\t [--includes PATH|none]\n\ -\t [--initramfs auto|none|live-boot|live-initramfs|casper]\n\ +\t [--includes PATH]\n\ +\t [--initramfs auto|live-initramfs|casper]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ \t [--iso-application NAME]\n\ @@ -90,7 +90,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\ \t [--linux-packages \"PACKAGES\"]\n\ \t [--losetup losetup|losetup.orig]\n\ -\t [--memtest memtest86+|memtest86|none]\n\ +\t [--memtest memtest86+|memtest86]\n\ \t [-m|--mirror-bootstrap URL]\n\ \t [--mirror-chroot URL]\n\ \t [--mirror-chroot-security URL]\n\ @@ -101,7 +101,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--mirror-binary-volatile URL]\n\ \t [--mirror-binary-backports URL]\n\ \t [--mirror-debian-installer URL]\n\ -\t [--mode debian|emdebian|ubuntu]\n\ +\t [--mode debian|emdebian]\n\ \t [--net-root-filesystem nfs|cfs]\n\ \t [--net-root-mountoptions OPTIONS]\n\ \t [--net-root-path PATH]\n\ @@ -111,7 +111,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--net-cow-path PATH]\n\ \t [--net-cow-server IP|HOSTNAME]\n\ \t [--net-tarball bzip2|gzip|tar|none]\n\ -\t [-p|--packages-lists LIST|\"LISTS\"]\n\ +\t [-p|--packages-lists FILE]\n\ \t [--packages PACKAGE|\"PACKAGES\"]\n\ \t [--quiet]\n\ \t [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\ @@ -127,7 +127,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--syslinux-menu true|false]\n\ \t [--sysvinit true|false]\n\ \t [--tasksel aptitude|tasksel]\n\ -\t [--tasks TASK|\"TASKS\"]\n\ +\t [--tasks TASK]\n\ \t [--templates PATH]\n\ \t [--virtual-root-size MB]\n\ \t [--volatile true|false]\n\ @@ -158,7 +158,7 @@ Local_arguments () help,ignore-system-defaults,quiet,usage,verbose,version" # Remove spaces added by indentation LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')" - ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name="${PROGRAM}" --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")" + ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")" if [ "${?}" != "0" ] then @@ -379,11 +379,6 @@ Local_arguments () shift 2 case "${LB_DISTRIBUTION}" in - lenny-backports) - LB_DISTRIBUTION="lenny" - BACKPORTS="true" - ;; - squeeze-backports) LB_DISTRIBUTION="squeeze" BACKPORTS="true" @@ -969,7 +964,7 @@ GZIP_OPTIONS="${GZIP_OPTIONS}" ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}" EOF -# Creating lb_bootstrap_* configuration +# Creating lh_bootstrap_* configuration cat > config/bootstrap << EOF # config/bootstrap - options for live-build(7), bootstrap stage @@ -1046,7 +1041,7 @@ LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" EOF -# Creating lb_chroot_* configuration +# Creating lh_chroot_* configuration mkdir -p config/chroot_apt mkdir -p config/chroot_local-hooks mkdir -p config/chroot_local-includes @@ -1136,7 +1131,7 @@ LB_SYMLINKS="${LB_SYMLINKS}" LB_SYSVINIT="${LB_SYSVINIT}" EOF -# Creating lb_binary_* configuration +# Creating lh_binary_* configuration mkdir -p config/binary_debian-installer mkdir -p config/binary_debian-installer-includes mkdir -p config/binary_grub @@ -1309,7 +1304,7 @@ LB_SYSLINUX_MENU_MEMTEST_ENTRY="${LB_SYSLINUX_MENU_MEMTEST_ENTRY}" LB_USERNAME="${LB_USERNAME}" EOF -# Creating lb_source_* configuration +# Creating lh_source_* configuration cat > config/source << EOF # config/source - options for live-build(7), source stage @@ -1346,23 +1341,27 @@ then cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF # Backports Maintainers -deb http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS} -deb-src http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS} +deb http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free +deb-src http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free EOF cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot config/chroot_sources/${LB_DISTRIBUTION}-backports.binary # Adding apt preferences - if ! grep -qs "^Pin: release o=Debian Backports" config/chroot_apt/preferences + if ! grep -qs "^Pin: release o=backports.debian-maintainers.org" config/chroot_apt/preferences then cat >> config/chroot_apt/preferences << EOF Package: * -Pin: release o=Debian Backports +Pin: release o=backports.debian-maintainers.org Pin-Priority: 999 EOF fi + + # Addding archive signing key + wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg + cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LB_DISTRIBUTION}-backports.binary.gpg fi # Checking defaults again diff --git a/scripts/build/lb_local b/scripts/build/lb_local index eba79eafd..a1f66fd7e 100755 --- a/scripts/build/lb_local +++ b/scripts/build/lb_local @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source b/scripts/build/lb_source index 8a3a3dc50..e790223f7 100755 --- a/scripts/build/lb_source +++ b/scripts/build/lb_source @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_checksums b/scripts/build/lb_source_checksums index 9864500c9..4997eea64 100755 --- a/scripts/build/lb_source_checksums +++ b/scripts/build/lb_source_checksums @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian index 4d231d1ba..ec1449784 100755 --- a/scripts/build/lb_source_debian +++ b/scripts/build/lb_source_debian @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_debian-live b/scripts/build/lb_source_debian-live index faa201ae7..f750c867b 100755 --- a/scripts/build/lb_source_debian-live +++ b/scripts/build/lb_source_debian-live @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk index 1fa55f200..edc7f0d8f 100755 --- a/scripts/build/lb_source_disk +++ b/scripts/build/lb_source_disk @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_iso b/scripts/build/lb_source_iso index 4d1f6f517..0da2925e7 100755 --- a/scripts/build/lb_source_iso +++ b/scripts/build/lb_source_iso @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_net b/scripts/build/lb_source_net index 1700c30bb..aa425c424 100755 --- a/scripts/build/lb_source_net +++ b/scripts/build/lb_source_net @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_tar b/scripts/build/lb_source_tar index e9c55baa1..4d45e2c21 100755 --- a/scripts/build/lb_source_tar +++ b/scripts/build/lb_source_tar @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_usb b/scripts/build/lb_source_usb index 0af9e1081..eb185268f 100755 --- a/scripts/build/lb_source_usb +++ b/scripts/build/lb_source_usb @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd index ed3d2cc99..babd8eb1c 100755 --- a/scripts/build/lb_source_virtual-hdd +++ b/scripts/build/lb_source_virtual-hdd @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/lb_testroot b/scripts/build/lb_testroot index 2920b9b46..52a05d270 100755 --- a/scripts/build/lb_testroot +++ b/scripts/build/lb_testroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/scripts/build/live-build b/scripts/build/live-build index 50dd3dd77..a0e480ebf 100755 --- a/scripts/build/live-build +++ b/scripts/build/live-build @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by |