From 7809c0ef964d22a8622c51d6cdf846b443099d19 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 26 Feb 2012 19:55:28 +0100 Subject: Removing --username cruft, live-config bootparameters should be used via --bootappend-live. --- functions/defaults.sh | 15 -- manpages/de/lb_config.de.1 | 4 - manpages/en/lb_config.1 | 4 - manpages/po/de/lb_config.1.po | 532 ++++++++++++++++++++--------------------- manpages/pot/lb_config.1.pot | 532 ++++++++++++++++++++--------------------- scripts/build/lb_binary_grub | 16 -- scripts/build/lb_binary_grub2 | 16 -- scripts/build/lb_binary_silo | 16 -- scripts/build/lb_binary_yaboot | 16 -- scripts/build/lb_chroot_hacks | 5 - scripts/build/lb_config | 12 +- 11 files changed, 517 insertions(+), 651 deletions(-) diff --git a/functions/defaults.sh b/functions/defaults.sh index 97211570e..15e1d6c06 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -1181,21 +1181,6 @@ Set_defaults () ;; esac - # Setting username - case "${LB_MODE}" in - ubuntu) - LB_USERNAME="${LB_USERNAME:-ubuntu}" - ;; - - kubuntu) - LB_USERNAME="${LB_USERNAME:-ubuntu}" - ;; - - *) - LB_USERNAME="${LB_USERNAME:-user}" - ;; - esac - # Setting swap file LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}" diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 7f6bd40e8..787d4203d 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -238,8 +238,6 @@ [\fB\-\-backports\fP true|false] .br [\fB\-\-exposed\-root\fP true|false] -.br - [\fB\-\-username\fP \fINAME\fP] .br [\fB\-\-verbose\fP] .br @@ -766,8 +764,6 @@ or not. defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false. -.IP "\fB\-\-username\fP \fINAME\fP" 4 -sets the name of the account of the default user in the live system. .IP \fB\-\-verbose\fP 4 increases the verbosity of messages output by \fBlb build\fP. .IP "\fB\-\-win32\-loader true|false\fP" 4 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index e1d99baad..cb59689c4 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -232,8 +232,6 @@ [\fB\-\-backports\fR true|false] .br [\fB\-\-exposed\-root\fR true|false] -.br - [\fB\-\-username\fR \fINAME\fR] .br [\fB\-\-verbose\fR] .br @@ -486,8 +484,6 @@ defines if debian volatile package archives should be included in the image or n defines if debian backports package archives should be included in the image or not. .IP "\fB\-\-exposed\-root\fR true|false" 4 defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false. -.IP "\fB\-\-username\fR \fINAME\fR" 4 -sets the name of the account of the default user in the live system. .IP "\fB\-\-verbose\fR" 4 increases the verbosity of messages output by \fBlb build\fR. .IP "\fB\-\-win32\-loader true|false" 4 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index f0101a761..584b913f3 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-02-26 19:49+0100\n" +"POT-Creation-Date: 2012-02-26 19:53+0100\n" "PO-Revision-Date: 2012-02-04 21:39+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -231,7 +231,7 @@ msgstr "" #: en/lb_chroot_packages.1:9 en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 #: en/lb_chroot_selinuxfs.1:9 en/lb_chroot_sysfs.1:9 en/lb_chroot_sysv-rc.1:9 #: en/lb_chroot_task-lists.1:9 en/lb_chroot_upstart.1:9 en/lb_clean.1:9 -#: en/lb_config.1:243 en/lb_local.1:9 en/lb_source.1:9 +#: en/lb_config.1:241 en/lb_local.1:9 en/lb_source.1:9 #: en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_hdd.1:9 #: en/lb_source_iso.1:9 en/lb_source_net.1:9 en/lb_source_tar.1:9 @@ -264,7 +264,7 @@ msgstr "" #: en/lb_chroot_proc.1:14 en/lb_chroot_resolv.1:14 en/lb_chroot_selinuxfs.1:14 #: en/lb_chroot_sysfs.1:14 en/lb_chroot_sysv-rc.1:14 #: en/lb_chroot_task-lists.1:14 en/lb_chroot_upstart.1:14 en/lb_clean.1:16 -#: en/lb_config.1:252 en/lb_local.1:14 en/lb_source.1:14 +#: en/lb_config.1:250 en/lb_local.1:14 en/lb_source.1:14 #: en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_hdd.1:14 #: en/lb_source_iso.1:14 en/lb_source_net.1:14 en/lb_source_tar.1:14 @@ -297,7 +297,7 @@ msgstr "" #: en/lb_chroot_proc.1:17 en/lb_chroot_resolv.1:17 en/lb_chroot_selinuxfs.1:17 #: en/lb_chroot_sysfs.1:17 en/lb_chroot_sysv-rc.1:17 #: en/lb_chroot_task-lists.1:17 en/lb_chroot_upstart.1:17 en/lb_clean.1:38 -#: en/lb_config.1:502 en/lb_local.1:17 en/lb_source.1:17 +#: en/lb_config.1:498 en/lb_local.1:17 en/lb_source.1:17 #: en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_hdd.1:17 #: en/lb_source_iso.1:17 en/lb_source_net.1:17 en/lb_source_tar.1:17 @@ -330,7 +330,7 @@ msgstr "" #: en/lb_chroot_proc.1:21 en/lb_chroot_resolv.1:21 en/lb_chroot_selinuxfs.1:21 #: en/lb_chroot_sysfs.1:21 en/lb_chroot_sysv-rc.1:21 #: en/lb_chroot_task-lists.1:21 en/lb_chroot_upstart.1:21 en/lb_clean.1:43 -#: en/lb_config.1:509 en/lb_local.1:20 en/lb_source.1:20 +#: en/lb_config.1:505 en/lb_local.1:20 en/lb_source.1:20 #: en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_hdd.1:21 #: en/lb_source_iso.1:21 en/lb_source_net.1:21 en/lb_source_tar.1:21 @@ -363,7 +363,7 @@ msgstr "" #: en/lb_chroot_proc.1:23 en/lb_chroot_resolv.1:23 en/lb_chroot_selinuxfs.1:23 #: en/lb_chroot_sysfs.1:23 en/lb_chroot_sysv-rc.1:23 #: en/lb_chroot_task-lists.1:23 en/lb_chroot_upstart.1:23 en/lb_clean.1:45 -#: en/lb_config.1:511 en/lb_local.1:22 en/lb_source.1:22 +#: en/lb_config.1:507 en/lb_local.1:22 en/lb_source.1:22 #: en/lb_source_checksums.1:23 en/lb_source_debian-live.1:23 #: en/lb_source_debian.1:23 en/lb_source_disk.1:23 en/lb_source_hdd.1:23 #: en/lb_source_iso.1:23 en/lb_source_net.1:23 en/lb_source_tar.1:23 @@ -395,7 +395,7 @@ msgstr "" #: en/lb_chroot_proc.1:25 en/lb_chroot_resolv.1:25 en/lb_chroot_selinuxfs.1:25 #: en/lb_chroot_sysfs.1:25 en/lb_chroot_sysv-rc.1:25 #: en/lb_chroot_task-lists.1:25 en/lb_chroot_upstart.1:25 en/lb_clean.1:47 -#: en/lb_config.1:517 en/lb_local.1:24 en/lb_source.1:24 +#: en/lb_config.1:513 en/lb_local.1:24 en/lb_source.1:24 #: en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_hdd.1:25 #: en/lb_source_iso.1:25 en/lb_source_net.1:25 en/lb_source_tar.1:25 @@ -427,7 +427,7 @@ msgstr "" #: en/lb_chroot_proc.1:26 en/lb_chroot_resolv.1:26 en/lb_chroot_selinuxfs.1:26 #: en/lb_chroot_sysfs.1:26 en/lb_chroot_sysv-rc.1:26 #: en/lb_chroot_task-lists.1:26 en/lb_chroot_upstart.1:26 en/lb_clean.1:48 -#: en/lb_config.1:518 en/lb_local.1:25 en/lb_source.1:25 +#: en/lb_config.1:514 en/lb_local.1:25 en/lb_source.1:25 #: en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_hdd.1:26 #: en/lb_source_iso.1:26 en/lb_source_net.1:26 en/lb_source_tar.1:26 @@ -460,7 +460,7 @@ msgstr "" #: en/lb_chroot_proc.1:28 en/lb_chroot_resolv.1:28 en/lb_chroot_selinuxfs.1:28 #: en/lb_chroot_sysfs.1:28 en/lb_chroot_sysv-rc.1:28 #: en/lb_chroot_task-lists.1:28 en/lb_chroot_upstart.1:28 en/lb_clean.1:50 -#: en/lb_config.1:520 en/lb_local.1:27 en/lb_source.1:27 +#: en/lb_config.1:516 en/lb_local.1:27 en/lb_source.1:27 #: en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_hdd.1:28 #: en/lb_source_iso.1:28 en/lb_source_net.1:28 en/lb_source_tar.1:28 @@ -495,7 +495,7 @@ msgstr "" #: en/lb_chroot_proc.1:29 en/lb_chroot_resolv.1:29 en/lb_chroot_selinuxfs.1:29 #: en/lb_chroot_sysfs.1:29 en/lb_chroot_sysv-rc.1:29 #: en/lb_chroot_task-lists.1:29 en/lb_chroot_upstart.1:29 en/lb_clean.1:51 -#: en/lb_config.1:521 en/lb_local.1:28 en/lb_source.1:28 +#: en/lb_config.1:517 en/lb_local.1:28 en/lb_source.1:28 #: en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_hdd.1:29 #: en/lb_source_iso.1:29 en/lb_source_net.1:29 en/lb_source_tar.1:29 @@ -528,7 +528,7 @@ msgstr "" #: en/lb_chroot_proc.1:31 en/lb_chroot_resolv.1:31 en/lb_chroot_selinuxfs.1:31 #: en/lb_chroot_sysfs.1:31 en/lb_chroot_sysv-rc.1:31 #: en/lb_chroot_task-lists.1:31 en/lb_chroot_upstart.1:31 en/lb_clean.1:53 -#: en/lb_config.1:523 en/lb_local.1:30 en/lb_source.1:30 +#: en/lb_config.1:519 en/lb_local.1:30 en/lb_source.1:30 #: en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_hdd.1:31 #: en/lb_source_iso.1:31 en/lb_source_net.1:31 en/lb_source_tar.1:31 @@ -564,7 +564,7 @@ msgstr "" #: en/lb_chroot_proc.1:32 en/lb_chroot_resolv.1:32 en/lb_chroot_selinuxfs.1:32 #: en/lb_chroot_sysfs.1:32 en/lb_chroot_sysv-rc.1:32 #: en/lb_chroot_task-lists.1:32 en/lb_chroot_upstart.1:32 en/lb_clean.1:54 -#: en/lb_config.1:524 en/lb_local.1:31 en/lb_source.1:31 +#: en/lb_config.1:520 en/lb_local.1:31 en/lb_source.1:31 #: en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_hdd.1:32 #: en/lb_source_iso.1:32 en/lb_source_net.1:32 en/lb_source_tar.1:32 @@ -597,7 +597,7 @@ msgstr "" #: en/lb_chroot_proc.1:33 en/lb_chroot_resolv.1:33 en/lb_chroot_selinuxfs.1:33 #: en/lb_chroot_sysfs.1:33 en/lb_chroot_sysv-rc.1:33 #: en/lb_chroot_task-lists.1:33 en/lb_chroot_upstart.1:33 en/lb_clean.1:55 -#: en/lb_config.1:525 en/lb_local.1:32 en/lb_source.1:32 +#: en/lb_config.1:521 en/lb_local.1:32 en/lb_source.1:32 #: en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_hdd.1:33 #: en/lb_source_iso.1:33 en/lb_source_net.1:33 en/lb_source_tar.1:33 @@ -1188,22 +1188,17 @@ msgstr "" #. type: Plain text #: en/lb_config.1:237 -msgid " [B<--username> I]" -msgstr "" - -#. type: Plain text -#: en/lb_config.1:239 msgid " [B<--verbose>]" msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:242 +#: en/lb_config.1:240 msgid " [B<--win32-loader true|false]>" msgstr "" #. type: Plain text -#: en/lb_config.1:245 +#: en/lb_config.1:243 msgid "" "B is a high-level command (porcelain) of I(7), the " "Debian Live tool suite." @@ -1211,7 +1206,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:248 +#: en/lb_config.1:246 msgid "" "B populates the configuration directory for live-build. By " "default, this directory is named 'config' and is created in the current " @@ -1220,7 +1215,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:251 +#: en/lb_config.1:249 msgid "" "Note: Currently B tries to be smart and sets defaults for some " "options depending on the setting of other options (e.g. which linux packages " @@ -1236,7 +1231,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/lb_config.1:254 +#: en/lb_config.1:252 msgid "" "In addition to its specific options B understands all generic " "live-build options. See I(7) for a complete list of all generic " @@ -1245,26 +1240,26 @@ msgstr "" #. FIXME #. type: IP -#: en/lb_config.1:256 +#: en/lb_config.1:254 #, no-wrap msgid "B<--apt> apt|aptitude" msgstr "" #. type: Plain text -#: en/lb_config.1:258 +#: en/lb_config.1:256 msgid "" "defines if apt-get or aptitude is used to install packages when building the " "image. The default is apt." msgstr "" #. type: IP -#: en/lb_config.1:258 +#: en/lb_config.1:256 #, no-wrap msgid "B<--apt-ftp-proxy> I" msgstr "" #. type: Plain text -#: en/lb_config.1:260 +#: en/lb_config.1:258 msgid "" "sets the ftp proxy to be used by apt. By default, this is empty but if the " "host has the environment variable ftp_proxy set, apt-ftp-proxy gets " @@ -1272,13 +1267,13 @@ msgid "" msgstr "" #. type: IP -#: en/lb_config.1:260 +#: en/lb_config.1:258 #, no-wrap msgid "B<--apt-http-proxy> I" msgstr "" #. type: Plain text -#: en/lb_config.1:262 +#: en/lb_config.1:260 msgid "" "sets the http proxy to be used by apt. By default, this is empty but if the " "host has the environment variable http_proxy set, apt-http-proxy gets " @@ -1286,26 +1281,26 @@ msgid "" msgstr "" #. type: IP -#: en/lb_config.1:262 +#: en/lb_config.1:260 #, no-wrap msgid "B<--apt-indices> true|false|none" msgstr "" #. type: Plain text -#: en/lb_config.1:264 +#: en/lb_config.1:262 msgid "" "defines if the resulting images should have apt indices or not and defaults " "to true. If set to none, no indices are included at all." msgstr "" #. type: IP -#: en/lb_config.1:264 +#: en/lb_config.1:262 #, no-wrap msgid "B<--apt-options> I