Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
live-build
Commits
cfcdd3e6
Commit
cfcdd3e6
authored
Sep 19, 2013
by
Daniel Baumann
Browse files
Adding upstream version 4.0~alpha26.
parent
5092592c
Changes
21
Hide whitespace changes
Inline
Side-by-side
VERSION
View file @
cfcdd3e6
4.0~alpha2
5
-1
4.0~alpha2
6
-1
manpages/de/lb_bootstrap_cdebootstrap.de.1
View file @
cfcdd3e6
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 1
8
.09.2013 4.0~alpha2
5
\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 1
9
.09.2013 4.0~alpha2
6
\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
...
...
manpages/de/lb_bootstrap_debootstrap.de.1
View file @
cfcdd3e6
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 1
8
.09.2013 4.0~alpha2
5
\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 1
9
.09.2013 4.0~alpha2
6
\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
...
...
manpages/en/lb_bootstrap_cdebootstrap.1
View file @
cfcdd3e6
...
...
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-1
8
4.0~alpha2
5
-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-1
9
4.0~alpha2
6
-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
...
...
manpages/en/lb_bootstrap_debootstrap.1
View file @
cfcdd3e6
...
...
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-1
8
4.0~alpha2
5
-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-1
9
4.0~alpha2
6
-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
...
...
manpages/es/lb_bootstrap_cdebootstrap.es.1
View file @
cfcdd3e6
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 1
8
.09.2013 4.0~alpha2
5
\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 1
9
.09.2013 4.0~alpha2
6
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
...
...
manpages/es/lb_bootstrap_debootstrap.es.1
View file @
cfcdd3e6
...
...
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 1
8
.09.2013 4.0~alpha2
5
\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 1
9
.09.2013 4.0~alpha2
6
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
...
...
manpages/po/de/lb_bootstrap_cdebootstrap.1.po
View file @
cfcdd3e6
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha2
5
-1\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"Project-Id-Version: live-build 4.0~alpha2
6
-1\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
...
...
@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgstr "1
8
.09.2013"
msgid "2013-09-1
9
"
msgstr "1
9
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgstr "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr "4.0~alpha2
6
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/de/lb_bootstrap_debootstrap.1.po
View file @
cfcdd3e6
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha2
5
-1\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"Project-Id-Version: live-build 4.0~alpha2
6
-1\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
...
...
@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgstr "1
8
.09.2013"
msgid "2013-09-1
9
"
msgstr "1
9
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgstr "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr "4.0~alpha2
6
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/es/lb_bootstrap_cdebootstrap.1.po
View file @
cfcdd3e6
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha2
5
-1\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"Project-Id-Version: live-build 4.0~alpha2
6
-1\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
...
...
@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgstr "1
8
.09.2013"
msgid "2013-09-1
9
"
msgstr "1
9
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgstr "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr "4.0~alpha2
6
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/po/es/lb_bootstrap_debootstrap.1.po
View file @
cfcdd3e6
...
...
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha2
5
-1\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"Project-Id-Version: live-build 4.0~alpha2
6
-1\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
...
...
@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgstr "1
8
.09.2013"
msgid "2013-09-1
9
"
msgstr "1
9
.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgstr "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr "4.0~alpha2
6
-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...
...
manpages/pot/lb_bootstrap_cdebootstrap.1.pot
View file @
cfcdd3e6
...
...
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\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"
...
...
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgid "2013-09-1
9
"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr ""
#. type: TH
...
...
manpages/pot/lb_bootstrap_debootstrap.1.pot
View file @
cfcdd3e6
...
...
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-1
8 10:24
+0300\n"
"POT-Creation-Date: 2013-09-1
9 09:09
+0300\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"
...
...
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-1
8
"
msgid "2013-09-1
9
"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha2
5
-1"
msgid "4.0~alpha2
6
-1"
msgstr ""
#. type: TH
...
...
scripts/build/binary_syslinux
View file @
cfcdd3e6
...
...
@@ -232,24 +232,10 @@ _LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Install
case "
${
LB_MODE
}
" in
progress-linux)
_PROJECT="
Progress Linux
"
if ls config/package-lists/base-system.list*
then
_DESCRIPTION="
Base System
"
elif ls config/package-lists/gnome-desktop.list*
then
_DESCRIPTION="
GNOME Desktop
"
elif ls config/package-lists/lxc-server.list* > /dev/null 2>&1
then
_DESCRIPTION="
LXC Server
"
else
_DESCRIPTION=""
fi
;;
*)
_PROJECT="
Debian GNU/Linux
"
_DESCRIPTION=""
;;
esac
...
...
@@ -266,7 +252,6 @@ do
-e
"s|@PARENT_DISTRIBUTION@|
${
LB_PARENT_DISTRIBUTION
}
|g"
\
-e
"s|@VERSION@|
${
_VERSION
}
|g"
\
-e
"s|@ARCHITECTURE@|
${
_ARCHITECTURE
}
|g"
\
-e
"s|@DESCRIPTION@|
${
_DESCRIPTION
}
|g"
\
-e
"s|@DATE@|
${
_DATE
}
|g"
\
-e
"s|@YEAR@|
${
_YEAR
}
|g"
\
-e
"s|@MONTH@|
${
_MONTH
}
|g"
\
...
...
scripts/build/bootstrap_cdebootstrap
View file @
cfcdd3e6
#!/usr/bin/python3.
2
#!/usr/bin/python3.
3
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
...
...
scripts/build/bootstrap_debootstrap
View file @
cfcdd3e6
#!/usr/bin/python3.
2
#!/usr/bin/python3.
3
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
...
...
scripts/build/chroot_archives
View file @
cfcdd3e6
...
...
@@ -673,9 +673,32 @@ EOF
fi
fi
# probably too bold, needs refinment (FIXME)
rm
-f
chroot
/etc/apt/conf.d/
*
rm
-f
chroot
/etc/apt/preferences.d/
*
# Removing chroot-only apt sources
for
FILE
in
config/archives/
*
.list.chroot
do
if
[
-e
"
${
FILE
}
"
]
then
rm
-f
"chroot/etc/apt/sources.list.d/
$(
basename
${
FILE
}
.chroot
)
"
fi
done
# Removing chroot-only apt configuration
for
FILE
in
config/archives/
*
.conf.chroot
do
if
[
-e
"
${
FILE
}
"
]
then
rm
-f
"chroot/etc/apt/conf.d/
$(
basename
${
FILE
}
.chroot
)
"
fi
done
# Removing chroot-only apt preferences
for
FILE
in
config/archives/
*
.pref.chroot
do
if
[
-e
"
${
FILE
}
"
]
then
rm
-f
"chroot/etc/apt/preferences.d/
$(
basename
${
FILE
}
.chroot
)
"
fi
done
# Adding local apt sources (binary)
for
FILE
in
config/archives/
*
.list config/archives/
*
.list.binary
...
...
share/bootloaders/extlinux/splash.svg.in
View file @
cfcdd3e6
...
...
@@ -244,7 +244,7 @@
x=
"190.68135"
sodipodi:role=
"line"
style=
"font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id=
"tspan3041"
>
@DESCRIPTION@
@ARCHITECTURE@
</tspan><tspan
id=
"tspan3041"
>
@ARCHITECTURE@
</tspan><tspan
y=
"659.20679"
x=
"190.68135"
sodipodi:role=
"line"
...
...
share/bootloaders/isolinux/splash.svg.in
View file @
cfcdd3e6
...
...
@@ -244,7 +244,7 @@
x=
"190.68135"
sodipodi:role=
"line"
style=
"font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id=
"tspan3041"
>
@DESCRIPTION@
@ARCHITECTURE@
</tspan><tspan
id=
"tspan3041"
>
@ARCHITECTURE@
</tspan><tspan
y=
"659.20679"
x=
"190.68135"
sodipodi:role=
"line"
...
...
share/bootloaders/pxelinux/splash.svg.in
View file @
cfcdd3e6
...
...
@@ -244,7 +244,7 @@
x=
"190.68135"
sodipodi:role=
"line"
style=
"font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id=
"tspan3041"
>
@DESCRIPTION@
@ARCHITECTURE@
</tspan><tspan
id=
"tspan3041"
>
@ARCHITECTURE@
</tspan><tspan
y=
"659.20679"
x=
"190.68135"
sodipodi:role=
"line"
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment