From 575e0a8614081208a7c98d373adc8da1fd5c9b38 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 23 Mar 2011 14:27:42 +0100 Subject: Disabling kexec-tools by default in debian mode. --- scripts/build/lb_chroot_hacks | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index b78ba3a..5b8681a 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -55,6 +55,19 @@ case "${LB_DISTRIBUTION}" in esac # Handling default desktop configuration +case "${LB_MODE}" in + debian*) + # disable kexec-tools + if [ -e chroot/sbin/kexec ] + then + echo "kexec-tools kexec-tools/load_kexec boolean false" > chroot/root/preseed + Chroot chroot "debconf-set-selections /root/preseed" + rm -f chroot/root/preseed + Chroot chroot "dpkg-reconfigure kexec-tools" + fi + ;; +esac + for TASK in ${LB_TASKS} do case "${TASK}" in -- cgit v1.0 From e9cc77fe33e42897ee853450509e4ffd02be990d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Apr 2011 12:36:44 +0200 Subject: Synchronise internal version number. --- functions/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/common.sh b/functions/common.sh index 75f4ae7..48fb605 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -9,7 +9,7 @@ PROGRAM="live-build" -VERSION="2.0.12-1" +VERSION="2.0.12-2" CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')" PATH="${PWD}/auto/scripts:${PATH}" -- cgit v1.0 From c2755294c224c886980fb9389d27be8d6fe3f93a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 Jun 2011 10:27:48 +0200 Subject: Updating url for debian-installer daily-images. --- scripts/build/lb_binary_debian-installer | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index ee7bb64..be33890 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -231,36 +231,7 @@ then LB_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds - case "${LB_ARCHITECTURE}" in - alpha|amd64|hppa|ia64|mips|mipsel|powerpc) - URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/" - ;; - - arm|armel) - URL="http://people.debian.org/~kmuto/d-i/images/daily/" - ;; - - i386) - URL="http://people.debian.org/~joeyh/d-i/images/daily/" - ;; - - m68k) - URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/" - ;; - - s390) - URL="http://lophos.multibuild.org/d-i/images/daily/" - ;; - - sparc) - URL="http://people.debian.org/~stappers/d-i/images/daily/" - ;; - - *) - Echo_error "No daily-builds found for your architecture." - exit 1 - ;; - esac ++ URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" else URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/" fi -- cgit v1.0 From 5a7f579561cfce81e48b8481341f1c30d1ab29f0 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 9 Jun 2011 10:41:44 -0500 Subject: Correcting url line for daily-images. --- scripts/build/lb_binary_debian-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index be33890..f2c0bd7 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -231,7 +231,7 @@ then LB_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds -+ URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/" else URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/" fi -- cgit v1.0 From 2610155ec6f65f82b8a0881629d07935a79816c5 Mon Sep 17 00:00:00 2001 From: "Cody A.W. Somerville" Date: Wed, 20 Jul 2011 08:46:11 +0200 Subject: Fixing corruption of usb binary images caused by trying to modify flags in partition table when image is mounted with offset. --- scripts/build/lb_binary_usb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb index 51e6ca7..8a168c3 100755 --- a/scripts/build/lb_binary_usb +++ b/scripts/build/lb_binary_usb @@ -190,16 +190,10 @@ esac case "${LB_BUILD_WITH_CHROOT}" in true) Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}" - - Chroot chroot "parted -s ${FREELO} set 1 boot on" || true - Chroot chroot "parted -s ${FREELO} set 1 lba off" || true ;; false) mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO} - - parted -s ${FREELO} set 1 boot on || true - parted -s ${FREELO} set 1 lba off || true ;; esac @@ -265,6 +259,24 @@ ${LB_LOSETUP} -d ${FREELO} echo "!!! The above error/warning messages can be ignored !!!" +FREELO="$(${LB_LOSETUP} -f)" +Losetup "${FREELO}" chroot/binary.img 0 + +case "${LB_BUILD_WITH_CHROOT}" in + true) + Chroot chroot "parted -s ${FREELO} set 1 boot on" || true + Chroot chroot "parted -s ${FREELO} set 1 lba off" || true + ;; + + false) + parted -s "${FREELO}" set 1 boot on || true + parted -s "${FREELO}" set 1 lba off || true + ;; +esac + +sleep 1 +${LB_LOSETUP} -d ${FREELO} + if [ -n "${MAKEDEV}" ] then rm -rf chroot/dev -- cgit v1.0 From 907b756f647988b49e66a2bc4818cd3f22c932c3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 24 Jul 2011 09:19:39 +0200 Subject: Adding mdadm manually to extra packages for binary pool for being used by debian-installer (Closes: #607225). --- scripts/build/lb_binary_debian-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index f2c0bd7..11b5370 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -350,7 +350,7 @@ then ;; esac - DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2" + DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2" case "${LB_MODE}" in debian) -- cgit v1.0 From 31ea4e665cceb28745e7178e95d21257d16d99b7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Jul 2011 17:13:32 +0200 Subject: Updating grub packages list in binary_debian-installer. --- scripts/build/lb_binary_debian-installer | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index 11b5370..f6769cf 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -294,8 +294,7 @@ then case "${LB_ARCHITECTURE}" in amd64) - #DI_REQ_PACKAGES="lilo grub grub2" - DI_REQ_PACKAGES="lilo grub" + DI_REQ_PACKAGES="lilo grub grub-pc" case "${LB_MODE}" in ubuntu) @@ -309,8 +308,7 @@ then ;; i386) - #DI_REQ_PACKAGES="elilo lilo grub grub2" - DI_REQ_PACKAGES="elilo lilo grub" + DI_REQ_PACKAGES="elilo lilo grub grub-pc" case "${LB_MODE}" in ubuntu) -- cgit v1.0 From a8eb93e487ba855064da81aaa7a473e337512233 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Jul 2011 17:15:17 +0200 Subject: Using 'live' rather than 'incomplete' for cd_type in .disk on images that include debian-installer with live-installer udeb. --- scripts/build/lb_binary_disk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk index fe68a7d..c976cd5 100755 --- a/scripts/build/lb_binary_disk +++ b/scripts/build/lb_binary_disk @@ -123,14 +123,13 @@ case "${LB_DEBIAN_INSTALLER}" in touch binary/.disk/base_installable - echo "not_complete" > binary/.disk/cd_type - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then + echo "live" > binary/.disk/cd_type echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info else + echo "not_complete" > binary/.disk/cd_type echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info - fi cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include -- cgit v1.0 From 11840c8fc528512a0646406b66f5ea6f7a7b1408 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Aug 2011 20:47:46 +0200 Subject: Sleeping for 1 second before after accessing the loop device in order to not fail when removing it right afterwards. --- functions/losetup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/functions/losetup.sh b/functions/losetup.sh index df7e2d2..4e4f2ff 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -16,6 +16,8 @@ Losetup () ${LB_ROOT_COMMAND} ${LB_LOSETUP} "${DEVICE}" "${FILE}" FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)" + + sleep 1 ${LB_ROOT_COMMAND} ${LB_LOSETUP} -d "${DEVICE}" LOOPDEVICE="$(echo ${DEVICE}p${PARTITION})" -- cgit v1.0 From a6c244c9467cb94107789bb5e698a9a61aa9a0c1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Aug 2011 23:16:11 +0200 Subject: Removing non-existing studio-* lists from cgi form. --- templates/cgi/debian-official/form.html | 4 ---- templates/cgi/debian-unofficial/form.html | 4 ---- 2 files changed, 8 deletions(-) diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html index c54a4a4..beb7a09 100644 --- a/templates/cgi/debian-official/form.html +++ b/templates/cgi/debian-official/form.html @@ -65,10 +65,6 @@ - - - - diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html index 44982ca..bc21bf1 100644 --- a/templates/cgi/debian-unofficial/form.html +++ b/templates/cgi/debian-unofficial/form.html @@ -64,10 +64,6 @@ - - - - -- cgit v1.0 From f39fb4d901f56f2752a19b5f9e5d613761306780 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Sep 2011 16:19:45 +0200 Subject: Removing spurious version information in cgi form template. --- templates/cgi/debian-official/form.html | 1 - templates/cgi/debian-unofficial/form.html | 1 - 2 files changed, 2 deletions(-) diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html index beb7a09..e8b6ac0 100644 --- a/templates/cgi/debian-official/form.html +++ b/templates/cgi/debian-official/form.html @@ -327,6 +327,5 @@     -Version: VERSION diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html index bc21bf1..1cc8a2b 100644 --- a/templates/cgi/debian-unofficial/form.html +++ b/templates/cgi/debian-unofficial/form.html @@ -347,6 +347,5 @@     -Version: VERSION -- cgit v1.0 From f8c765ea228f87733d86875eabaff0b7de780d74 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Sep 2011 16:21:00 +0200 Subject: Adding link to live-build homepage and version information in cgi footer template. --- templates/cgi/debian-official/footer.html | 2 +- templates/cgi/debian-unofficial/footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/cgi/debian-official/footer.html b/templates/cgi/debian-official/footer.html index 6e2648a..6c2ce27 100644 --- a/templates/cgi/debian-official/footer.html +++ b/templates/cgi/debian-official/footer.html @@ -1,6 +1,6 @@ diff --git a/templates/cgi/debian-unofficial/footer.html b/templates/cgi/debian-unofficial/footer.html index 6e2648a..6c2ce27 100644 --- a/templates/cgi/debian-unofficial/footer.html +++ b/templates/cgi/debian-unofficial/footer.html @@ -1,6 +1,6 @@ -- cgit v1.0