diff options
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/losetup.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 39 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_disk | 5 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_usb | 24 | ||||
| -rw-r--r-- | templates/cgi/debian-official/footer.html | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-official/form.html | 5 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/footer.html | 2 | ||||
| -rw-r--r-- | templates/cgi/debian-unofficial/form.html | 5 |
9 files changed, 29 insertions, 57 deletions
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}" 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})" diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index ee7bb64..f6769cf 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_ARCHITECTURE}/daily/" else URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/" fi @@ -323,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) @@ -338,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) @@ -379,7 +348,7 @@ then ;; esac - DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2" + DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2" case "${LB_MODE}" in debian) 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 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 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 @@ <div id="footer"> <br /> - <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live@lists.debian.org"><debian-live@lists.debian.org></a> — <a href="http://live.debian.net/legal.html">Legal information</a></h2> + <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live@lists.debian.org"><debian-live@lists.debian.org></a> — <a href="http://live.debian.net/devel/live-build">live-build</a>, version VERSION — <a href="http://live.debian.net/legal.html">Legal information</a></h2> <br /> </div> diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html index c54a4a4..e8b6ac0 100644 --- a/templates/cgi/debian-official/form.html +++ b/templates/cgi/debian-official/form.html @@ -65,10 +65,6 @@ <option value="rescue">rescue</option> <option selected value="standard">standard</option> <option value="standard-x11">standard-x11</option> - <option value="studio">studio</option> - <option value="studio-gnome">studio-gnome</option> - <option value="studio-kde">studio-kde</option> - <option value="studio-xfce">studio-xfce</option> <option value="xfce">xfce</option> <option value="xfce-junior">xfce-junior</option> </select> @@ -331,6 +327,5 @@ <input type="submit" value="Submit" /> -Version: VERSION </form> 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 @@ <div id="footer"> <br /> - <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live@lists.debian.org"><debian-live@lists.debian.org></a> — <a href="http://live.debian.net/legal.html">Legal information</a></h2> + <h2 id="subtitle">Debian Live Project <a href="mailto:debian-live@lists.debian.org"><debian-live@lists.debian.org></a> — <a href="http://live.debian.net/devel/live-build">live-build</a>, version VERSION — <a href="http://live.debian.net/legal.html">Legal information</a></h2> <br /> </div> diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html index 44982ca..1cc8a2b 100644 --- a/templates/cgi/debian-unofficial/form.html +++ b/templates/cgi/debian-unofficial/form.html @@ -64,10 +64,6 @@ <option value="rescue">rescue</option> <option selected value="standard">standard</option> <option value="standard-x11">standard-x11</option> - <option value="studio">studio</option> - <option value="studio-gnome">studio-gnome</option> - <option value="studio-kde">studio-kde</option> - <option value="studio-xfce">studio-xfce</option> <option value="xfce">xfce</option> <option value="xfce-junior">xfce-junior</option> </select> @@ -351,6 +347,5 @@ <input type="submit" value="Submit" /> -Version: VERSION </form> |