[SCM] live-build branch, debian-next, updated. debian/3.0_a6-1-8-gd816221
Daniel Baumann
daniel at debian.org
Mon Nov 22 18:51:43 UTC 2010
The following commit has been merged in the debian-next branch:
commit d816221b5e7b9a3b858e14b0cfd961b6ad06cd5f
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 22 19:51:23 2010 +0100
Removing cdrom-detect/try-usb workaround, not needed anymore.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index af027c5..c801656 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -927,16 +927,6 @@ Set_defaults ()
esac
fi
- case "${LB_BINARY_IMAGES}" in
- iso-hybrid|usb*)
- # Try USB block devices for install media
- if ! echo "${LB_BOOTAPPEND_INSTALL}" | grep -q try-usb
- then
- LB_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LB_BOOTAPPEND_INSTALL}"
- fi
- ;;
- esac
-
if [ -n ${_LB_BOOTAPPEND_PRESEED} ]
then
LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL} ${_LB_BOOTAPPEND_PRESEED}"
--
live-build
More information about the debian-live-changes
mailing list