Dropping automagics for ubuntu.

Future live-build versions will still allow to use casper,
but its configuration will be done differently by a custom
config tree, rather than embedded and maintenance intensive
code in live-build itself.

25 files changed, 26 insertions, 351 deletions

diff --git a/data/debian-cd/lucid b/data/debian-cd/lucid
deleted file mode 120000
index 5cb6e6000..000000000
--- a/data/debian-cd/lucid
+++ /dev/null
@@ -1 +0,0 @@
-maverick
\ No newline at end of file
diff --git a/data/debian-cd/maverick/amd64_netinst_udeb_include b/data/debian-cd/maverick/amd64_netinst_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/amd64_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/amd64_udeb_include b/data/debian-cd/maverick/amd64_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/amd64_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/armel_netinst_udeb_include b/data/debian-cd/maverick/armel_netinst_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/armel_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/armel_udeb_include b/data/debian-cd/maverick/armel_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/armel_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/exclude-udebs b/data/debian-cd/maverick/exclude-udebs
deleted file mode 100644
index 252dba2a0..000000000
--- a/data/debian-cd/maverick/exclude-udebs
+++ /dev/null
@@ -1 +0,0 @@
-kernel-image-*
diff --git a/data/debian-cd/maverick/i386_businesscard_udeb_include b/data/debian-cd/maverick/i386_businesscard_udeb_include
deleted file mode 100644
index c8849a918..000000000
--- a/data/debian-cd/maverick/i386_businesscard_udeb_include
+++ /dev/null
@@ -1,5 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/i386_netinst_udeb_include b/data/debian-cd/maverick/i386_netinst_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/i386_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/i386_udeb_include b/data/debian-cd/maverick/i386_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/i386_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/ia64_netinst_udeb_include b/data/debian-cd/maverick/ia64_netinst_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/ia64_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/ia64_udeb_include b/data/debian-cd/maverick/ia64_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/ia64_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/powerpc_businesscard_udeb_include b/data/debian-cd/maverick/powerpc_businesscard_udeb_include
deleted file mode 100644
index b5c5e7ea2..000000000
--- a/data/debian-cd/maverick/powerpc_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/powerpc_netinst_udeb_include b/data/debian-cd/maverick/powerpc_netinst_udeb_include
deleted file mode 100644
index 4a83dd2ab..000000000
--- a/data/debian-cd/maverick/powerpc_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/powerpc_udeb_include b/data/debian-cd/maverick/powerpc_udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/powerpc_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/maverick/udeb_include b/data/debian-cd/maverick/udeb_include
deleted file mode 100644
index 275197a49..000000000
--- a/data/debian-cd/maverick/udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4598ec662..6093ad057 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -58,10 +58,6 @@ New_configuration ()
 			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
 			;;
 
-		ubuntu)
-			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
-			;;
-
 		*)
 			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
 			;;
@@ -96,13 +92,13 @@ Set_defaults ()
 	# Setting system type
 	LB_SYSTEM="${LB_SYSTEM:-live}"
 
-	# Setting mode (currently: debian, progress-linux, and ubuntu)
+	# Setting mode (currently: debian, progress-linux)
 	if [ -x /usr/bin/lsb_release ]
 	then
 		_DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")"
 
 		case "${_DISTRIBUTOR}" in
-			debian|progress-linux|ubuntu)
+			debian|progress-linux)
 				LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}"
 				;;
 
@@ -114,9 +110,6 @@ Set_defaults ()
 		if [ -e /etc/progress-linux_version ]
 		then
 			LB_MODE="${LB_MODE:-progress-linux}"
-		elif [ -e /etc/ubuntu_version ]
-		then
-			LB_MODE="${LB_MODE:-ubuntu}"
 		else
 			LB_MODE="${LB_MODE:-debian}"
 		fi
@@ -130,11 +123,6 @@ Set_defaults ()
 			LB_DERIVATIVE_IS_BASED_ON="debian"
 			;;
 
-		ubuntu)
-			LB_DISTRIBUTION="${LB_DISTRIBUTION:-quantal}"
-			LB_DERIVATIVE="false"
-			;;
-
 		*)
 			LB_DISTRIBUTION="${LB_DISTRIBUTION:-stretch}"
 			LB_DERIVATIVE="false"
@@ -246,14 +234,6 @@ Set_defaults ()
 
 	# Setting initsystem
 	case "${LB_MODE}" in
-		ubuntu)
-			case "${LB_INITRAMFS}" in
-				live-boot)
-					LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
-					;;
-			esac
-			;;
-
 		progress-linux)
 			case "${LB_DISTRIBUTION}" in
 				cairon*)
@@ -354,20 +334,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
 			;;
-
-		ubuntu)
-			case "${LB_ARCHITECTURES}" in
-				amd64|i386)
-					LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
-			;;
 	esac
 
 	LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
@@ -384,20 +350,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
-
-		ubuntu)
-			case "${LB_ARCHITECTURES}" in
-				amd64|i386)
-					LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
-			;;
 	esac
 
 	# Setting mirror which ends up in the image
@@ -411,20 +363,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}"
 			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
 			;;
-
-		ubuntu)
-			case "${LB_ARCHITECTURES}" in
-				amd64|i386)
-					LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
-				;;
-
-				*)
-					LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
-			;;
 	esac
 
 	# Setting security mirror which ends up in the image
@@ -438,20 +376,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
-
-		ubuntu)
-			case "${LB_ARCHITECTURES}" in
-				amd64|i386)
-					LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
-					;;
-
-				*)
-					LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
-					;;
-			esac
-
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
-			;;
 	esac
 
 	case "${LB_MODE}" in
@@ -478,67 +402,28 @@ Set_defaults ()
 	LB_INTERACTIVE="${LB_INTERACTIVE:-false}"
 
 	# Setting keyring packages
-	case "${LB_MODE}" in
-		ubuntu)
-			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
-			;;
-
-		*)
-			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
-			;;
-	esac
+	LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
 
 	# Setting linux flavour string
 	case "${LB_ARCHITECTURES}" in
 		arm64)
-			case "${LB_MODE}" in
-				ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
-					;;
-
-				*)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-arm64}"
-					;;
-			esac
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-arm64}"
 			;;
 
 		armel)
-			case "${LB_MODE}" in
-                                ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}"
-					;;
-				*)
-					# armel will have special images: one rootfs image and many additional kernel images.
-					# therefore we default to all available armel flavours
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
-					;;
-			esac
+			# armel will have special images: one rootfs image and many additional kernel images.
+			# therefore we default to all available armel flavours
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
 			;;
 
 		armhf)
-			case "${LB_MODE}" in
-				ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
-					;;
-
-				*)
-					# armhf will have special images: one rootfs image and many additional kernel images.
-					# therefore we default to all available armhf flavours
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
-					;;
-			esac
+			# armhf will have special images: one rootfs image and many additional kernel images.
+			# therefore we default to all available armhf flavours
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
 			;;
 
 		amd64)
-			case "${LB_MODE}" in
-				ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
-					;;
-
-				*)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}"
-					;;
-			esac
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}"
 			;;
 
 		i386)
@@ -547,18 +432,6 @@ Set_defaults ()
 					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
 					;;
 
-				ubuntu)
-					case "${LB_DISTRIBUTION}" in
-						precise)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
-							;;
-					esac
-					;;
-
 				*)
 					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-586}"
 					;;
@@ -585,10 +458,6 @@ Set_defaults ()
 					exit 1
 					;;
 
-				ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
-					;;
-
 				*)
 					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc64 powerpc}"
 					;;
@@ -597,7 +466,7 @@ Set_defaults ()
 
 		s390x)
 			case "${LB_MODE}" in
-				progress-linux|ubuntu)
+				progress-linux)
 					Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
 					exit 1
 					;;
@@ -615,15 +484,7 @@ Set_defaults ()
 	esac
 
 	# Set linux packages
-	case "${LB_MODE}" in
-		ubuntu)
-			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}"
-			;;
-
-		*)
-			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
-			;;
-	esac
+	LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
 
 	# Setting security updates option
 	case "${LB_PARENT_DISTRIBUTION}" in
@@ -757,20 +618,7 @@ Set_defaults ()
 				;;
 
 			hdd*)
-				case "${LB_MODE}" in
-					ubuntu)
-						if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
-						then
-							_LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
-						else
-							_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
-						fi
-						;;
-
-					*)
-						_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
-						;;
-				esac
+				_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
 				;;
 
 			netboot)
@@ -806,10 +654,6 @@ Set_defaults ()
 		progress-linux)
 			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
 			;;
-
-		ubuntu)
-			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}"
-			;;
 	esac
 
 	# Set iso preparer
@@ -835,10 +679,6 @@ Set_defaults ()
 		progress-linux)
 			LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr "[a-z]" "[A-Z]")}"
 			;;
-
-		ubuntu)
-			LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}"
-			;;
 	esac
 
 	# Setting hdd size
@@ -853,10 +693,6 @@ Set_defaults ()
 		progress-linux)
 			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}"
 			;;
-
-		ubuntu)
-			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
-			;;
 	esac
 
 	# Setting memtest option
@@ -864,7 +700,7 @@ Set_defaults ()
 
 	# Setting loadlin option
 	case "${LB_MODE}" in
-		progress-linux|ubuntu)
+		progress-linux)
 
 			;;
 
@@ -888,7 +724,7 @@ Set_defaults ()
 
 	# Setting win32-loader option
 	case "${LB_MODE}" in
-		progress-linux|ubuntu)
+		progress-linux)
 
 			;;
 
@@ -934,17 +770,8 @@ Set_defaults ()
 	LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
 
 	# Setting firmware option
-	case "${LB_MODE}" in
-		ubuntu)
-			LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}"
-			LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}"
-			;;
-
-		*)
-			LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
-			LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
-			;;
-	esac
+	LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
+	LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
 
 	# Setting swap file
 	LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}"
diff --git a/functions/releases.sh b/functions/releases.sh
index 55a152b5a..771413357 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -16,9 +16,3 @@ RELEASE_sid="unstable"
 # Progress Linux releases
 RELEASE_baureo="2"
 RELEASE_cairon="3"
-
-# Ubuntu releases
-RELEASE_lucid="10.04"		# LTS: 2015-04-01
-RELEASE_precise="12.04"		# LTS: 2017-04-01
-RELEASE_quantal="12.10"		# 2014-04-01
-RELEASE_raring="13.04"		# 2014-10-01
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 066f4f135..4f444b0be 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -60,12 +60,6 @@ case "${LB_MODE}" in
 		TRACE="project/trace/ftp-master.debian.org"
 		;;
 
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
 	progress-linux)
 		TITLE="Progress Linux"
 		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index ba2f49a22..f4fa0f67e 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -137,11 +137,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				# Move image
 				mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 
 				if [ -e chroot/chroot.cache ]
 				then
@@ -348,10 +344,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		if [ "${LB_MODE}" != "ubuntu" ]
-		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
-		fi
+		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
@@ -367,11 +360,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 				rm -f chroot/chroot/excludes
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 
 				# Move image
 				mv chroot/filesystem.squashfs binary/${INITFS}
@@ -432,11 +421,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
 				;;
 		esac
 
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 99adc0d0d..eecb6b263 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -48,10 +48,6 @@ case "${LB_MODE}" in
 		RUN_LABEL="Run Progress Linux"
 		;;
 
-	ubuntu)
-		RUN_LABEL="Run Ubuntu"
-		;;
-
 	*)
 		RUN_LABEL="Run Debian GNU/Linux"
 		;;
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 56a3d4c33..2bc127b35 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -126,15 +126,6 @@ then
 				fi
 			fi
 			;;
-
-		ubuntu)
-			echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-			if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-			then
-				echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-			fi
-			;;
 	esac
 fi
 
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index a5c589a92..a52a44d22 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -127,15 +127,6 @@ EOF
 						fi
 					fi
 					;;
-
-				ubuntu)
-					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-					then
-						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-					fi
-					;;
 			esac
 		fi
 
@@ -625,15 +616,6 @@ EOF
 						fi
 					fi
 					;;
-
-				ubuntu)
-					echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-					then
-						echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-					fi
-					;;
 			esac
 		fi
 
diff --git a/scripts/build/config b/scripts/build/config
index e526d9276..633590cba 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -91,7 +91,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-binary URL]\n\
 \t    [--mirror-binary-security URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|ubuntu]\n\
+\t    [--mode debian]\n\
 \t    [--system live|normal]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index ed1adf411..8b09ec08f 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -317,51 +317,17 @@ then
 	case "${LB_ARCHITECTURES}" in
 		amd64)
 			DI_REQ_PACKAGES="lilo grub-pc"
-
-			case "${LB_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
 			;;
 
 		i386)
 			DI_REQ_PACKAGES="elilo lilo grub-pc"
-
-			case "${LB_MODE}" in
-				ubuntu)
-					case "${LB_DISTRIBUTION}" in
-						precise)
-							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
-							;;
-
-						*)
-							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
-							;;
-					esac
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
 			;;
 
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
-			case "${LB_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
 			;;
 	esac
 
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 4f773f06d..6cf99e0c0 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -60,12 +60,6 @@ case "${LB_MODE}" in
 		TRACE="project/trace/ftp-master.debian.org"
 		;;
 
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
 	progress-linux)
 		TITLE="Progress Linux"
 		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"