summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-17 13:51:44 +0100
committerDaniel Baumann <daniel@debian.org>2012-12-17 13:51:44 +0100
commit7e8240cd5e063895ee6e16745e0ea4b22658c6e5 (patch)
tree11d414ac8e01ae3a4dfe99cb216805e5ab291cc9
parent0b87c8239b4492f13e6e288862a512faee6e0104 (diff)
downloadvyos-live-build-7e8240cd5e063895ee6e16745e0ea4b22658c6e5.tar.gz
vyos-live-build-7e8240cd5e063895ee6e16745e0ea4b22658c6e5.zip
Removing kubuntu mode, it's not different anymore to standard ubuntu mode.
-rwxr-xr-xfunctions/defaults.sh54
-rw-r--r--manpages/de/lb.de.12
-rw-r--r--manpages/de/lb_binary.de.12
-rw-r--r--manpages/de/lb_bootstrap.de.12
-rw-r--r--manpages/de/lb_build.de.12
-rw-r--r--manpages/de/lb_chroot.de.12
-rw-r--r--manpages/de/lb_clean.de.12
-rw-r--r--manpages/de/lb_config.de.14
-rw-r--r--manpages/de/lb_source.de.12
-rw-r--r--manpages/de/lb_testroot.de.12
-rw-r--r--manpages/de/live-build.de.72
-rw-r--r--manpages/en/lb.12
-rw-r--r--manpages/en/lb_binary.12
-rw-r--r--manpages/en/lb_bootstrap.12
-rw-r--r--manpages/en/lb_build.12
-rw-r--r--manpages/en/lb_chroot.12
-rw-r--r--manpages/en/lb_clean.12
-rw-r--r--manpages/en/lb_config.14
-rw-r--r--manpages/en/lb_source.12
-rw-r--r--manpages/en/lb_testroot.12
-rw-r--r--manpages/en/live-build.72
-rw-r--r--manpages/po/de/lb.1.po4
-rw-r--r--manpages/po/de/lb_binary.1.po4
-rw-r--r--manpages/po/de/lb_bootstrap.1.po4
-rw-r--r--manpages/po/de/lb_build.1.po4
-rw-r--r--manpages/po/de/lb_chroot.1.po4
-rw-r--r--manpages/po/de/lb_clean.1.po4
-rw-r--r--manpages/po/de/lb_config.1.po6
-rw-r--r--manpages/po/de/lb_source.1.po4
-rw-r--r--manpages/po/de/lb_testroot.1.po4
-rw-r--r--manpages/po/de/live-build.7.po4
-rw-r--r--manpages/pot/lb.1.pot4
-rw-r--r--manpages/pot/lb_binary.1.pot4
-rw-r--r--manpages/pot/lb_bootstrap.1.pot4
-rw-r--r--manpages/pot/lb_build.1.pot4
-rw-r--r--manpages/pot/lb_chroot.1.pot4
-rw-r--r--manpages/pot/lb_clean.1.pot4
-rw-r--r--manpages/pot/lb_config.1.pot6
-rw-r--r--manpages/pot/lb_source.1.pot4
-rw-r--r--manpages/pot/lb_testroot.1.pot4
-rw-r--r--manpages/pot/live-build.7.pot4
-rwxr-xr-xscripts/build/binary_debian-installer8
-rwxr-xr-xscripts/build/binary_disk6
-rwxr-xr-xscripts/build/binary_rootfs8
-rwxr-xr-xscripts/build/chroot_archives6
-rwxr-xr-xscripts/build/config2
-rwxr-xr-xscripts/build/source_disk6
-rwxr-xr-xshare/hooks/0150-remove-gnome-icon-cache.chroot2
48 files changed, 98 insertions, 122 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a89eae5cf..3157c9ee4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -21,7 +21,7 @@ Set_defaults ()
# Setting system type
LB_SYSTEM="${LB_SYSTEM:-live}"
- # Setting mode (currently: debian, emdebian, progress-linux, ubuntu and kubuntu)
+ # Setting mode (currently: debian, emdebian, progress-linux, and ubuntu)
if [ -x /usr/bin/lsb_release ]
then
_DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])"
@@ -54,7 +54,7 @@ Set_defaults ()
LB_DERIVATIVE="true"
;;
- ubuntu|kubuntu)
+ ubuntu)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}"
LB_DERIVATIVE="false"
;;
@@ -176,7 +176,7 @@ Set_defaults ()
case "${LB_SYSTEM}" in
live)
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
LB_INITRAMFS="${LB_INITRAMFS:-casper}"
;;
@@ -195,7 +195,7 @@ Set_defaults ()
# Setting initsystem
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_INITRAMFS}" in
live-boot)
LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
@@ -365,7 +365,7 @@ Set_defaults ()
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
@@ -400,7 +400,7 @@ Set_defaults ()
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
@@ -422,7 +422,7 @@ Set_defaults ()
LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
@@ -476,7 +476,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
@@ -508,7 +508,7 @@ Set_defaults ()
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
@@ -535,7 +535,7 @@ Set_defaults ()
LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
@@ -590,7 +590,7 @@ Set_defaults ()
LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
- ubuntu|kubuntu)
+ ubuntu)
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
@@ -636,7 +636,7 @@ Set_defaults ()
# Setting keyring packages
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
;;
@@ -649,7 +649,7 @@ Set_defaults ()
case "${LB_ARCHITECTURES}" in
armel)
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}"
;;
*)
@@ -668,7 +668,7 @@ Set_defaults ()
amd64)
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
@@ -692,7 +692,7 @@ Set_defaults ()
esac
;;
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_DISTRIBUTION}" in
precise)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
@@ -738,7 +738,7 @@ Set_defaults ()
exit 1
;;
- ubuntu|kubuntu)
+ ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
;;
@@ -750,7 +750,7 @@ Set_defaults ()
s390)
case "${LB_MODE}" in
- progress-linux|ubuntu|kubuntu)
+ progress-linux|ubuntu)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
@@ -782,7 +782,7 @@ Set_defaults ()
# Set linux packages
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}"
;;
@@ -953,7 +953,7 @@ Set_defaults ()
hdd*)
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
_LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
@@ -1009,10 +1009,6 @@ Set_defaults ()
ubuntu)
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}"
;;
-
- kubuntu)
- LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Kubuntu Live}"
- ;;
esac
# Set iso preparer
@@ -1046,10 +1042,6 @@ Set_defaults ()
ubuntu)
LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}"
;;
-
- kubuntu)
- LB_HDD_LABEL="${LB_HDD_LABEL:-KUBUNTU}"
- ;;
esac
# Setting hdd size
@@ -1072,10 +1064,6 @@ Set_defaults ()
ubuntu)
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
;;
-
- kubuntu)
- LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
- ;;
esac
# Setting memtest option
@@ -1083,7 +1071,7 @@ Set_defaults ()
# Setting loadlin option
case "${LB_MODE}" in
- progress-linux|ubuntu|kubuntu)
+ progress-linux|ubuntu)
;;
@@ -1107,7 +1095,7 @@ Set_defaults ()
# Setting win32-loader option
case "${LB_MODE}" in
- progress-linux|ubuntu|kubuntu)
+ progress-linux|ubuntu)
;;
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index ad1a023ef..e945634c4 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index fb23cee7b..aa71aa3ff 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index aa1db7a50..fa764ddd0 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 57fbbb7b8..05270de43 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index 01443c433..0a7a108d2 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index 73fa007d3..913f9c45c 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 9b902ffd6..b5e5da0bf 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
@@ -178,7 +178,7 @@
.br
[\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
.br
- [\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu|kubuntu]
+ [\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu]
.br
[\fB\-\-system\fP live|normal]
.br
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index bc733972d..1a5be003a 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 075b8de3a..961502d0a 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 12d8cdf3d..65d86ed20 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-12\-17 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index cac29fe9d..b119d8cf7 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index 53f29c8b2..a73fac9a8 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index b26300706..c81f80773 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 796c1e7fb..aa355e9b5 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 1b2cd7a95..9dc1ccdc8 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index 297b7ad7a..94580a0d2 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index fa50d84ac..c165ac260 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
@@ -173,7 +173,7 @@
.br
[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
.br
- [\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu|kubuntu]
+ [\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu]
.br
[\fB\-\-system\fR live|normal]
.br
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index bfabb837b..ba6ec913b 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb source\fR \- Complete the source stage
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index a88b89acb..b30304b50 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 081377eac..8c83e7b3c 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-12\-16 3.0~b2-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-12\-17 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fR \- the Debian Live tool suite
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 4c62ac575..65f2e5eb0 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index ff211914c..78694aab0 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 55aa5ad68..8f6600845 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index 6862e08a4..881606c13 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 02d8aef7f..40f9c0cc3 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index d2e37ee46..3fc4c901b 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 6aa0f6323..f447bb115 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
@@ -593,7 +593,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:177
-msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]"
+msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu]"
msgstr ""
#. type: Plain text
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index f1608d595..568ee0515 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 549c87d97..745316f6d 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index a58f03466..a2f6a3c80 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index b28caca6e..31f191d5e 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 1825ee48f..72afc3355 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 25c6b7487..fdd1f331a 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index 1b7aed677..1c29f469e 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index 5a8978ac5..e3c5e8649 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index bbda2df8b..d2df20423 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 98499c77b..a9d3b2298 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
@@ -593,7 +593,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:177
-msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]"
+msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu]"
msgstr ""
#. type: Plain text
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 19790129f..ef0e2d520 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index 07885da17..5c88d518e 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 47579834a..d537e4409 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-12-16 21:57+0100\n"
+"POT-Creation-Date: 2012-12-17 13:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-12-16"
+msgid "2012-12-17"
msgstr ""
#. type: TH
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index c72122f88..7e76f63f1 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -342,7 +342,7 @@ then
DI_REQ_PACKAGES="lilo grub grub-pc"
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
;;
@@ -356,7 +356,7 @@ then
DI_REQ_PACKAGES="elilo lilo grub grub-pc"
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
case "${LB_DISTRIBUTION}" in
precise)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
@@ -377,7 +377,7 @@ then
sparc)
DI_REQ_PACKAGES="silo"
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64"
;;
@@ -390,7 +390,7 @@ then
powerpc)
DI_REQ_PACKAGES="yaboot"
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc"
;;
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index c71338a90..8b7a43c3f 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -66,12 +66,6 @@ case "${LB_MODE}" in
TRACE=""
;;
- kubuntu)
- TITLE="Kubuntu"
- 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 421a4502b..df70d605b 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -147,7 +147,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
@@ -357,7 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
esac
fi
- if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && [ "${LB_MODE}" != "ubuntu" ] && [ "${LB_MODE}" != "kubuntu" ]
+ if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && [ "${LB_MODE}" != "ubuntu" ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
fi
@@ -377,7 +377,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f chroot/chroot/excludes
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
@@ -442,7 +442,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index da8417ef0..99433cf4c 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -131,7 +131,7 @@ EOF
fi
;;
- ubuntu|kubuntu)
+ 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" ]
@@ -196,7 +196,7 @@ EOF
do
# ubuntu workaround to allow using live.debian.net
case "${LB_MODE}" in
- ubuntu|kubuntu)
+ ubuntu)
if [ "${REPOSITORY}" = "live.debian.net" ]
then
_DISTRIBUTION="sid"
@@ -701,7 +701,7 @@ EOF
fi
;;
- ubuntu|kubuntu)
+ 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" ]
diff --git a/scripts/build/config b/scripts/build/config
index 33429bb8d..4edb7cd86 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -100,7 +100,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-binary-updates URL]\n\
\t [--mirror-binary-backports URL]\n\
\t [--mirror-debian-installer URL]\n\
-\t [--mode debian|emdebian|ubuntu|kubuntu]\n\
+\t [--mode debian|emdebian|ubuntu]\n\
\t [--system live|normal]\n\
\t [--net-root-filesystem nfs|cfs]\n\
\t [--net-root-mountoptions OPTIONS]\n\
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 380fdd599..caca200c2 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -66,12 +66,6 @@ case "${LB_MODE}" in
TRACE=""
;;
- kubuntu)
- TITLE="Kubuntu"
- STRING="Build ${ARCHITECTURE}"
- TRACE=""
- ;;
-
progress-linux)
TITLE="Progress Linux"
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
diff --git a/share/hooks/0150-remove-gnome-icon-cache.chroot b/share/hooks/0150-remove-gnome-icon-cache.chroot
index f562fd939..ab35a1d68 100755
--- a/share/hooks/0150-remove-gnome-icon-cache.chroot
+++ b/share/hooks/0150-remove-gnome-icon-cache.chroot
@@ -4,6 +4,6 @@ set -e
# Remove GNOME icon cache.
#
-# This saves space some space (e.g. on Kubuntu).
+# This saves space some space.
rm -f /usr/share/icons/*/icon-theme.cache