josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tweak to clarify bootstrap vs debootstrap

Browse source 
git-svn-id: http://emdebian.org/svn/current@7738 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-02-02 21:42:52 +00:00
parent d7f50d601e
commit 65d3511701
6 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
multistrap
View file

@ -385,7 +385,7 @@ if (-l "${dir}lib64" ) {
printf (_g("ERR: Some files may have been unpacked outside %s!\n"), $dir); printf (_g("ERR: Some files may have been unpacked outside %s!\n"), $dir);
} }
} }
# cleanly separate the debootstrap sources from the final apt sources. # cleanly separate the bootstrap sources from the final apt sources.
unlink ("${dir}etc/apt/sources.list.d/multistrap.sources.list") unlink ("${dir}etc/apt/sources.list.d/multistrap.sources.list")
if (-f "${dir}etc/apt/sources.list.d/multistrap.sources.list"); if (-f "${dir}etc/apt/sources.list.d/multistrap.sources.list");
opendir (LISTS, "${dir}etc/apt/sources.list.d/") opendir (LISTS, "${dir}etc/apt/sources.list.d/")
@ -830,7 +830,7 @@ unpack=true
# aptsources is a list of sections to be used for downloading packages # aptsources is a list of sections to be used for downloading packages
# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources.list # and lists and placed in the /etc/apt/sources.list.d/multistrap.sources.list
# of the target. Order is not important # of the target. Order is not important
aptsources=Grip Updates aptsources=Debian
# the order of sections is not important. # the order of sections is not important.
# the bootstrap option determines which repository # the bootstrap option determines which repository
# is used to calculate the list of Priority: required packages. # is used to calculate the list of Priority: required packages.
@ -842,12 +842,12 @@ source=http://cdn.debian.net/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=lenny suite=lenny
This will result in a completely normal debootstrap of Debian lenny from This will result in a completely normal bootstrap of Debian lenny from
the specified mirror, for armel in /opt/multistrap/. the specified mirror, for armel in /opt/multistrap/.
'Architecture' and 'directory' can be overridden on the command line. 'Architecture' and 'directory' can be overridden on the command line.
Specify a package to extend the debootstap to include that package and Specify a package to extend the bootstap to include that package and
all dependencies. Dependencies will be calculated by apt so as to use all dependencies. Dependencies will be calculated by apt so as to use
only the most recent suitable version from all configured repositories. only the most recent suitable version from all configured repositories.

14
po/da.po
View file

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: multistrap\n" "Project-Id-Version: multistrap\n"
"Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
"POT-Creation-Date: 2011-02-01 22:27+0000\n" "POT-Creation-Date: 2011-02-02 21:37+0000\n"
"PO-Revision-Date: 2010-09-03 17:30+01:00\n" "PO-Revision-Date: 2010-09-03 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@ -361,7 +361,7 @@ msgid ""
"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources." "# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources."
"list\n" "list\n"
"# of the target. Order is not important\n" "# of the target. Order is not important\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# the order of sections is not important.\n" "# the order of sections is not important.\n"
"# the bootstrap option determines which repository\n" "# the bootstrap option determines which repository\n"
"# is used to calculate the list of Priority: required packages.\n" "# is used to calculate the list of Priority: required packages.\n"
@ -373,12 +373,12 @@ msgid ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"This will result in a completely normal debootstrap of Debian lenny from\n" "This will result in a completely normal bootstrap of Debian lenny from\n"
"the specified mirror, for armel in /opt/multistrap/.\n" "the specified mirror, for armel in /opt/multistrap/.\n"
"\n" "\n"
"'Architecture' and 'directory' can be overridden on the command line.\n" "'Architecture' and 'directory' can be overridden on the command line.\n"
"\n" "\n"
"Specify a package to extend the debootstap to include that package and\n" "Specify a package to extend the bootstap to include that package and\n"
"all dependencies. Dependencies will be calculated by apt so as to use\n" "all dependencies. Dependencies will be calculated by apt so as to use\n"
"only the most recent suitable version from all configured repositories.\n" "only the most recent suitable version from all configured repositories.\n"
"\n" "\n"
@ -427,7 +427,7 @@ msgstr ""
"# aptsources er en liste over afsnit, som skal bruges til at hente pakker\n" "# aptsources er en liste over afsnit, som skal bruges til at hente pakker\n"
"# og lister, og er placeret i mållisten\n" "# og lister, og er placeret i mållisten\n"
"# /etc/apt/sources.list.d/multistrap.sources. Rækkefølge er ikke vigtig\n" "# /etc/apt/sources.list.d/multistrap.sources. Rækkefølge er ikke vigtig\n"
"aptsources=Grip opdaterer\n" "aptsources=Debian\n"
"# rækkefølgen af afsnit er ikke vigtig.\n" "# rækkefølgen af afsnit er ikke vigtig.\n"
"# tilvalget debootstrap afgør hvilket arkiv der bruges til at \n" "# tilvalget debootstrap afgør hvilket arkiv der bruges til at \n"
"# kalkulere prioritetslisten: Krævede pakker.\n" "# kalkulere prioritetslisten: Krævede pakker.\n"
@ -439,12 +439,12 @@ msgstr ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"Dette vil resultere i en fuldstændig normal debootstrap af Debian lenny\n" "Dette vil resultere i en fuldstændig normal bootstrap af Debian lenny\n"
"fra det angivne spejlarkiv, for armel i /opt/multistrap/.\n" "fra det angivne spejlarkiv, for armel i /opt/multistrap/.\n"
"\n" "\n"
"'Arkitektur' og 'mappe' kan overskrives på kommandolinjen.\n" "'Arkitektur' og 'mappe' kan overskrives på kommandolinjen.\n"
"\n" "\n"
"Angiv en pakke for at udvide debootstap til at inkludere den ønskede pakke\n" "Angiv en pakke for at udvide bootstap til at inkludere den ønskede pakke\n"
"og alle afhængigheder. Afhængigheder vil blive beregnet af apt, så kun de\n" "og alle afhængigheder. Afhængigheder vil blive beregnet af apt, så kun de\n"
"nyeste kodepakker fra alle konfigurerede arkiver bruges.\n" "nyeste kodepakker fra alle konfigurerede arkiver bruges.\n"
"\n" "\n"

14
po/fr.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: multistrap\n" "Project-Id-Version: multistrap\n"
"Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
"POT-Creation-Date: 2011-02-01 22:27+0000\n" "POT-Creation-Date: 2011-02-02 21:37+0000\n"
"PO-Revision-Date: 2010-09-26 21:07+0200\n" "PO-Revision-Date: 2010-09-26 21:07+0200\n"
"Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n" "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@ -371,7 +371,7 @@ msgid ""
"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources." "# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources."
"list\n" "list\n"
"# of the target. Order is not important\n" "# of the target. Order is not important\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# the order of sections is not important.\n" "# the order of sections is not important.\n"
"# the bootstrap option determines which repository\n" "# the bootstrap option determines which repository\n"
"# is used to calculate the list of Priority: required packages.\n" "# is used to calculate the list of Priority: required packages.\n"
@ -383,12 +383,12 @@ msgid ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"This will result in a completely normal debootstrap of Debian lenny from\n" "This will result in a completely normal bootstrap of Debian lenny from\n"
"the specified mirror, for armel in /opt/multistrap/.\n" "the specified mirror, for armel in /opt/multistrap/.\n"
"\n" "\n"
"'Architecture' and 'directory' can be overridden on the command line.\n" "'Architecture' and 'directory' can be overridden on the command line.\n"
"\n" "\n"
"Specify a package to extend the debootstap to include that package and\n" "Specify a package to extend the bootstap to include that package and\n"
"all dependencies. Dependencies will be calculated by apt so as to use\n" "all dependencies. Dependencies will be calculated by apt so as to use\n"
"only the most recent suitable version from all configured repositories.\n" "only the most recent suitable version from all configured repositories.\n"
"\n" "\n"
@ -443,7 +443,7 @@ msgstr ""
"# lister et les placer dans le fichier /etc/apt/sources.list.d/multistrap." "# lister et les placer dans le fichier /etc/apt/sources.list.d/multistrap."
"sources.list\n" "sources.list\n"
"# de la cible. L'ordre n'a pas d'importance.\n" "# de la cible. L'ordre n'a pas d'importance.\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# L'ordre des sections n'est pas important.\n" "# L'ordre des sections n'est pas important.\n"
"# L'option bootstrap détermine le dépôt à utiliser pour calculer\n" "# L'option bootstrap détermine le dépôt à utiliser pour calculer\n"
"# la liste des paquets nécessaires (« Priority: required »).\n" "# la liste des paquets nécessaires (« Priority: required »).\n"
@ -455,14 +455,14 @@ msgstr ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"Cela se traduira par un debootstrap tout à fait ordinaire de Debian Lenny à\n" "Cela se traduira par un bootstrap tout à fait ordinaire de Debian Lenny à\n"
"partir du miroir indiqué, pour armel dans /opt/multistrap/.\n" "partir du miroir indiqué, pour armel dans /opt/multistrap/.\n"
"\n" "\n"
"Les valeurs de « arch » et « directory » peuvent être outrepassées en ligne " "Les valeurs de « arch » et « directory » peuvent être outrepassées en ligne "
"de\n" "de\n"
"commande.\n" "commande.\n"
"\n" "\n"
"Indiquez un paquet pour étendre le debootstrap afin d'inclure ce paquet et\n" "Indiquez un paquet pour étendre le bootstrap afin d'inclure ce paquet et\n"
"toutes ses dépendances. Les dépendances seront déterminées par apt afin\n" "toutes ses dépendances. Les dépendances seront déterminées par apt afin\n"
"d'utiliser uniquement la version la plus récente de tous les dépôts " "d'utiliser uniquement la version la plus récente de tous les dépôts "
"configurés.\n" "configurés.\n"

14
po/pt.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: multistrap\n" "Project-Id-Version: multistrap\n"
"Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
"POT-Creation-Date: 2011-02-01 22:27+0000\n" "POT-Creation-Date: 2011-02-02 21:37+0000\n"
"PO-Revision-Date: 2010-09-12 23:50+0100\n" "PO-Revision-Date: 2010-09-12 23:50+0100\n"
"Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n" "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n"
@ -363,7 +363,7 @@ msgid ""
"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources." "# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources."
"list\n" "list\n"
"# of the target. Order is not important\n" "# of the target. Order is not important\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# the order of sections is not important.\n" "# the order of sections is not important.\n"
"# the bootstrap option determines which repository\n" "# the bootstrap option determines which repository\n"
"# is used to calculate the list of Priority: required packages.\n" "# is used to calculate the list of Priority: required packages.\n"
@ -375,12 +375,12 @@ msgid ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"This will result in a completely normal debootstrap of Debian lenny from\n" "This will result in a completely normal bootstrap of Debian lenny from\n"
"the specified mirror, for armel in /opt/multistrap/.\n" "the specified mirror, for armel in /opt/multistrap/.\n"
"\n" "\n"
"'Architecture' and 'directory' can be overridden on the command line.\n" "'Architecture' and 'directory' can be overridden on the command line.\n"
"\n" "\n"
"Specify a package to extend the debootstap to include that package and\n" "Specify a package to extend the bootstap to include that package and\n"
"all dependencies. Dependencies will be calculated by apt so as to use\n" "all dependencies. Dependencies will be calculated by apt so as to use\n"
"only the most recent suitable version from all configured repositories.\n" "only the most recent suitable version from all configured repositories.\n"
"\n" "\n"
@ -433,7 +433,7 @@ msgstr ""
"# aptsources é uma lista de secções a usar para descarregar pacotes\n" "# aptsources é uma lista de secções a usar para descarregar pacotes\n"
"# e listas e colocada em /etc/apt/sources.list.d/multistrap.sources.list\n" "# e listas e colocada em /etc/apt/sources.list.d/multistrap.sources.list\n"
"# no destino. A ordem não é importante\n" "# no destino. A ordem não é importante\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# a ordem das secções não é importante.\n" "# a ordem das secções não é importante.\n"
"# a opção debootstrap determina que repositório\n" "# a opção debootstrap determina que repositório\n"
"# é usado para calcular a lista de pacotes com Priority: required.\n" "# é usado para calcular a lista de pacotes com Priority: required.\n"
@ -445,12 +445,12 @@ msgstr ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"Isto resultará num debootstrap completamente normal do Debian lenny, a\n" "Isto resultará num bootstrap completamente normal do Debian lenny, a\n"
"partir do mirror indicado, para armel, em /opt/multistrap/.\n" "partir do mirror indicado, para armel, em /opt/multistrap/.\n"
"\n" "\n"
"'Architecture' e 'directory' podem ser substituídos na linha de comandos.\n" "'Architecture' e 'directory' podem ser substituídos na linha de comandos.\n"
"\n" "\n"
"Indique um pacote para aumentar o debootstap para incluir esse pacote e\n" "Indique um pacote para aumentar o bootstap para incluir esse pacote e\n"
"todas as dependências. As dependências serão calculadas pelo apt de modo\n" "todas as dependências. As dependências serão calculadas pelo apt de modo\n"
"a usar apenas a versão mais recente de todos os repositórios configurados.\n" "a usar apenas a versão mais recente de todos os repositórios configurados.\n"
"\n" "\n"

14
po/vi.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: multistrap 2.1.7\n" "Project-Id-Version: multistrap 2.1.7\n"
"Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
"POT-Creation-Date: 2011-02-01 22:27+0000\n" "POT-Creation-Date: 2011-02-02 21:37+0000\n"
"PO-Revision-Date: 2010-09-29 19:59+0930\n" "PO-Revision-Date: 2010-09-29 19:59+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@ -369,7 +369,7 @@ msgid ""
"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources." "# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources."
"list\n" "list\n"
"# of the target. Order is not important\n" "# of the target. Order is not important\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# the order of sections is not important.\n" "# the order of sections is not important.\n"
"# the bootstrap option determines which repository\n" "# the bootstrap option determines which repository\n"
"# is used to calculate the list of Priority: required packages.\n" "# is used to calculate the list of Priority: required packages.\n"
@ -381,12 +381,12 @@ msgid ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"This will result in a completely normal debootstrap of Debian lenny from\n" "This will result in a completely normal bootstrap of Debian lenny from\n"
"the specified mirror, for armel in /opt/multistrap/.\n" "the specified mirror, for armel in /opt/multistrap/.\n"
"\n" "\n"
"'Architecture' and 'directory' can be overridden on the command line.\n" "'Architecture' and 'directory' can be overridden on the command line.\n"
"\n" "\n"
"Specify a package to extend the debootstap to include that package and\n" "Specify a package to extend the bootstap to include that package and\n"
"all dependencies. Dependencies will be calculated by apt so as to use\n" "all dependencies. Dependencies will be calculated by apt so as to use\n"
"only the most recent suitable version from all configured repositories.\n" "only the most recent suitable version from all configured repositories.\n"
"\n" "\n"
@ -437,7 +437,7 @@ msgstr ""
"sách,\n" "sách,\n"
"# mà nằm trong « /etc/apt/sources.list.d/multistrap.sources.list »\n" "# mà nằm trong « /etc/apt/sources.list.d/multistrap.sources.list »\n"
"# của đích. Thứ tự cũng không quan trọng.\n" "# của đích. Thứ tự cũng không quan trọng.\n"
"aptsources=Grip Updates\n" "aptsources=Debian\n"
"# Thứ tự các phần cũng không quan trọng.\n" "# Thứ tự các phần cũng không quan trọng.\n"
"# Tuỳ chọn debootstrap quyết định kho lưu nào được dùng\n" "# Tuỳ chọn debootstrap quyết định kho lưu nào được dùng\n"
"# để tính danh sách các gói có mức ưu tiên « Yêu cầu »\n" "# để tính danh sách các gói có mức ưu tiên « Yêu cầu »\n"
@ -449,14 +449,14 @@ msgstr ""
"keyring=debian-archive-keyring\n" "keyring=debian-archive-keyring\n"
"suite=lenny\n" "suite=lenny\n"
"\n" "\n"
"Cấu hình này có kết quả là một debootstrap Debian lenny\n" "Cấu hình này có kết quả là một bootstrap Debian lenny\n"
"hoàn toàn thông thường từ máy nhân bản đưa ra,\n" "hoàn toàn thông thường từ máy nhân bản đưa ra,\n"
"cho kiến trúc armel trong « /opt/multistrap/ ».\n" "cho kiến trúc armel trong « /opt/multistrap/ ».\n"
"\n" "\n"
"'Architecture' (kiến trúc) và 'directory' (thư mục)\n" "'Architecture' (kiến trúc) và 'directory' (thư mục)\n"
"cũng có thể được ghi đè trên dòng lệnh.\n" "cũng có thể được ghi đè trên dòng lệnh.\n"
"\n" "\n"
"Ghi rõ một gói nào đó để mở rộng deboostrap để bao gồm gói đó\n" "Ghi rõ một gói nào đó để mở rộng boostrap để bao gồm gói đó\n"
"và tất cả các quan hệ phụ thuộc. Quan hệ phụ thuộc được apt tính\n" "và tất cả các quan hệ phụ thuộc. Quan hệ phụ thuộc được apt tính\n"
"để sử dụng chỉ phiên bản thích hợp mới nhất từ tất cả các kho lưu\n" "để sử dụng chỉ phiên bản thích hợp mới nhất từ tất cả các kho lưu\n"
"được cấu hình.\n" "được cấu hình.\n"

2
pod/multistrap
View file

@ -83,7 +83,7 @@ Example configuration:
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=lenny suite=lenny
This will result in a completely normal debootstrap of Debian lenny from This will result in a completely normal bootstrap of Debian lenny from
the specified mirror, for armel in '/opt/multistrap/'. (This configuration the specified mirror, for armel in '/opt/multistrap/'. (This configuration
is retained in the package as F</usr/share/multistrap/lenny.conf>) is retained in the package as F</usr/share/multistrap/lenny.conf>)