diff --git a/functions/defaults.sh b/functions/defaults.sh index 9e4f8415a..d8698d5d3 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -20,15 +20,24 @@ Set_defaults () # Setting distribution name case "${LB_MODE}" in progress) + _DERIVATIVE="true" + LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}" + LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}" ;; ubuntu) + _DERIVATIVE="false" + LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}" + LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}" ;; *) + _DERIVATIVE="false" + LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}" + LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}" ;; esac @@ -431,6 +440,15 @@ Set_defaults () LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}" + if [ -z "${LB_REPOSITORIES}" ] + then + case "${LB_MODE}" in + progress) + LB_REPOSITORIES="progress-linux_${LB_DISTRIBUTION}" + ;; + esac + fi + # Setting archive areas value case "${LB_MODE}" in ubuntu) @@ -761,7 +779,7 @@ Set_defaults () esac # Setting debian-installer distribution - LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}" + LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" # Setting debian-installer-gui case "${LB_MODE}" in @@ -891,7 +909,7 @@ Set_defaults () # Setting win32-loader option case "${LB_MODE}" in progress|ubuntu) - :: + ;; *) diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index c27f1eb15..153ea20fe 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -89,6 +89,8 @@ [\fB\-\-debug\fP] .br [\-d|\fB\-\-distribution\fP \fICODENAME\fP] +.br + [\fB\-\-parent\-distribution\fP \fICODENAME\fP] .br [\fB\-\-dump\fP] .br @@ -435,6 +437,9 @@ whereas otherwise false, by default. turn on debugging informational messages. .IP "\-d|\fB\-\-distribution\fP \fICODENAME\fP" 4 defines the distribution of the resulting live system. +.IP "\-d|\fB\-\-parent\-distribution\fP \fICODENAME\fP" 4 +defines the parent distribution for derivatives of the resulting live +system. .IP \fB\-\-dump\fP 4 prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 215ae089d..d6a95bca5 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -84,6 +84,8 @@ [\fB\-\-debug\fR] .br [\-d|\fB\-\-distribution\fR \fICODENAME\fR] +.br + [\fB\-\-parent\-distribution\fR \fICODENAME\fR] .br [\fB\-\-dump\fR] .br @@ -307,6 +309,8 @@ defines if the debian\-installer graphical GTK interface should be true or not. turn on debugging informational messages. .IP "\-d|\fB\-\-distribution\fR \fICODENAME\fR" 4 defines the distribution of the resulting live system. +.IP "\-d|\fB\-\-parent\-distribution\fR \fICODENAME\fR" 4 +defines the parent distribution for derivatives of the resulting live system. .IP "\fB\-\-dump\fR" 4 prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug reports, we do get all informations required for us to locate and replicate an error. .IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index 8e77d1f73..415136dec 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: 2011-01-07 21:06+0100\n" +"POT-Creation-Date: 2011-01-07 21:27+0100\n" "PO-Revision-Date: 2011-01-02 01:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -245,7 +245,7 @@ msgstr "" #: en/lb_chroot_packages.1:9 en/lb_chroot_preseed.1:9 en/lb_chroot_proc.1:9 #: en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9 en/lb_chroot_sources.1:9 #: en/lb_chroot_sysfs.1:9 en/lb_chroot_sysv-rc.1:9 en/lb_chroot_tasks.1:9 -#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:221 en/lb_local.1:9 +#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:223 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_iso.1:9 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9 @@ -281,7 +281,7 @@ msgstr "" #: en/lb_chroot_preseed.1:14 en/lb_chroot_proc.1:14 en/lb_chroot_resolv.1:14 #: en/lb_chroot_selinuxfs.1:14 en/lb_chroot_sources.1:14 #: en/lb_chroot_sysfs.1:14 en/lb_chroot_sysv-rc.1:14 en/lb_chroot_tasks.1:14 -#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:230 +#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:232 #: 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_iso.1:14 en/lb_source_net.1:14 @@ -318,7 +318,7 @@ msgstr "" #: en/lb_chroot_preseed.1:17 en/lb_chroot_proc.1:17 en/lb_chroot_resolv.1:17 #: en/lb_chroot_selinuxfs.1:17 en/lb_chroot_sources.1:17 #: en/lb_chroot_sysfs.1:17 en/lb_chroot_sysv-rc.1:17 en/lb_chroot_tasks.1:17 -#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:456 +#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:460 #: 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_iso.1:17 en/lb_source_net.1:17 @@ -356,7 +356,7 @@ msgstr "" #: en/lb_chroot_preseed.1:21 en/lb_chroot_proc.1:21 en/lb_chroot_resolv.1:21 #: en/lb_chroot_selinuxfs.1:21 en/lb_chroot_sources.1:21 #: en/lb_chroot_sysfs.1:21 en/lb_chroot_sysv-rc.1:21 en/lb_chroot_tasks.1:21 -#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:463 +#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:467 #: 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_iso.1:21 en/lb_source_net.1:21 @@ -393,7 +393,7 @@ msgstr "" #: en/lb_chroot_preseed.1:23 en/lb_chroot_proc.1:23 en/lb_chroot_resolv.1:23 #: en/lb_chroot_selinuxfs.1:23 en/lb_chroot_sources.1:23 #: en/lb_chroot_sysfs.1:23 en/lb_chroot_sysv-rc.1:23 en/lb_chroot_tasks.1:23 -#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:465 +#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:469 #: 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_iso.1:23 en/lb_source_net.1:23 @@ -429,7 +429,7 @@ msgstr "" #: en/lb_chroot_preseed.1:25 en/lb_chroot_proc.1:25 en/lb_chroot_resolv.1:25 #: en/lb_chroot_selinuxfs.1:25 en/lb_chroot_sources.1:25 #: en/lb_chroot_sysfs.1:25 en/lb_chroot_sysv-rc.1:25 en/lb_chroot_tasks.1:25 -#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:467 +#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:471 #: 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_iso.1:25 en/lb_source_net.1:25 @@ -465,7 +465,7 @@ msgstr "" #: en/lb_chroot_preseed.1:26 en/lb_chroot_proc.1:26 en/lb_chroot_resolv.1:26 #: en/lb_chroot_selinuxfs.1:26 en/lb_chroot_sources.1:26 #: en/lb_chroot_sysfs.1:26 en/lb_chroot_sysv-rc.1:26 en/lb_chroot_tasks.1:26 -#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:468 +#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:472 #: 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_iso.1:26 en/lb_source_net.1:26 @@ -502,7 +502,7 @@ msgstr "" #: en/lb_chroot_preseed.1:28 en/lb_chroot_proc.1:28 en/lb_chroot_resolv.1:28 #: en/lb_chroot_selinuxfs.1:28 en/lb_chroot_sources.1:28 #: en/lb_chroot_sysfs.1:28 en/lb_chroot_sysv-rc.1:28 en/lb_chroot_tasks.1:28 -#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:470 +#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:474 #: 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_iso.1:28 en/lb_source_net.1:28 @@ -541,7 +541,7 @@ msgstr "" #: en/lb_chroot_preseed.1:29 en/lb_chroot_proc.1:29 en/lb_chroot_resolv.1:29 #: en/lb_chroot_selinuxfs.1:29 en/lb_chroot_sources.1:29 #: en/lb_chroot_sysfs.1:29 en/lb_chroot_sysv-rc.1:29 en/lb_chroot_tasks.1:29 -#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:471 +#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:475 #: 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_iso.1:29 en/lb_source_net.1:29 @@ -578,7 +578,7 @@ msgstr "" #: en/lb_chroot_preseed.1:31 en/lb_chroot_proc.1:31 en/lb_chroot_resolv.1:31 #: en/lb_chroot_selinuxfs.1:31 en/lb_chroot_sources.1:31 #: en/lb_chroot_sysfs.1:31 en/lb_chroot_sysv-rc.1:31 en/lb_chroot_tasks.1:31 -#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:473 +#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:477 #: 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_iso.1:31 en/lb_source_net.1:31 @@ -618,7 +618,7 @@ msgstr "" #: en/lb_chroot_preseed.1:32 en/lb_chroot_proc.1:32 en/lb_chroot_resolv.1:32 #: en/lb_chroot_selinuxfs.1:32 en/lb_chroot_sources.1:32 #: en/lb_chroot_sysfs.1:32 en/lb_chroot_sysv-rc.1:32 en/lb_chroot_tasks.1:32 -#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:474 +#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:478 #: 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_iso.1:32 en/lb_source_net.1:32 @@ -655,7 +655,7 @@ msgstr "" #: en/lb_chroot_preseed.1:33 en/lb_chroot_proc.1:33 en/lb_chroot_resolv.1:33 #: en/lb_chroot_selinuxfs.1:33 en/lb_chroot_sources.1:33 #: en/lb_chroot_sysfs.1:33 en/lb_chroot_sysv-rc.1:33 en/lb_chroot_tasks.1:33 -#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:475 +#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:479 #: 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_iso.1:33 en/lb_source_net.1:33 @@ -875,337 +875,342 @@ msgstr "" #. type: Plain text #: en/lb_config.1:89 -msgid " [B<--dump>]" +msgid " [B<--parent-distribution> I]" msgstr "" #. type: Plain text #: en/lb_config.1:91 -msgid " [B<--fdisk> fdisk|fdisk.dist]" +msgid " [B<--dump>]" msgstr "" #. type: Plain text #: en/lb_config.1:93 -msgid " [B<--force>]" +msgid " [B<--fdisk> fdisk|fdisk.dist]" msgstr "" #. type: Plain text #: en/lb_config.1:95 -msgid " [B<--grub-splash> I]" +msgid " [B<--force>]" msgstr "" #. type: Plain text #: en/lb_config.1:97 -msgid " [B<--gzip-options> I