[SCM] live-config branch, upstream, updated. upstream/2.0_a11-1-ga6d8fd8
Daniel Baumann
daniel at debian.org
Wed Jul 7 18:23:13 UTC 2010
The following commit has been merged in the upstream branch:
commit a6d8fd8d83501cf3fb41b18e40f3c5c06a50ce6d
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 7 20:22:04 2010 +0200
Adding upstream version 2.0~a12.
diff --git a/VERSION b/VERSION
index d44f652..41bc97f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a11
+2.0~a12
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 424e779..19bc543 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 20.06.2010 2.0~a11 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 07.07.2010 2.0~a12 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index e0829e6..77707ba 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2010\-06\-20 2.0~a11 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-07\-07 2.0~a12 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 27114c0..ab05fae 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 20.06.2010 2.0~a11 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 2010\-07\-07 2.0~a12 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 5f9aab4..10ad0ae 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0~a11\n"
-"POT-Creation-Date: 2010-06-20 19:17+0300\n"
+"Project-Id-Version: live-config 2.0~a12\n"
+"POT-Creation-Date: 2010-07-07 20:19+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-20"
-msgstr "20.06.2010"
+msgid "2010-07-07"
+msgstr "07.07.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a11"
-msgstr "2.0~a11"
+msgid "2.0~a12"
+msgstr "2.0~a12"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 2abdf51..32e432a 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a11\n"
-"POT-Creation-Date: 2010-06-20 19:17+0300\n"
+"POT-Creation-Date: 2010-07-07 20:19+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -23,14 +23,16 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
-#, no-wrap
-msgid "2010-06-20"
+#, fuzzy, no-wrap
+#| msgid "2010-06-20"
+msgid "2010-07-07"
msgstr "20.06.2010"
#. type: TH
#: en/live-config.7:9
-#, no-wrap
-msgid "2.0~a11"
+#, fuzzy, no-wrap
+#| msgid "2.0~a11"
+msgid "2.0~a12"
msgstr "2.0~a11"
#. type: TH
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 448ad02..f33999d 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-06-20 19:17+0300\n"
+"POT-Creation-Date: 2010-07-07 20:19+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-20"
+msgid "2010-07-07"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a11"
+msgid "2.0~a12"
msgstr ""
#. type: TH
diff --git a/scripts/config.sh b/scripts/config.sh
index 2fe1f0e..dc00229 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -179,6 +179,21 @@ Trap ()
return ${_RETURN}
}
+Start_network ()
+{
+ if [ -z "${_NETWORK}" ] && [ -e /etc/init.d/live-config ]
+ then
+ /etc/init.d/mountkernfs.sh start > /dev/null 2>&1
+ /etc/init.d/mountdevsubfs.sh start > /dev/null 2>&1
+ /etc/init.d/ifupdown-clean start > /dev/null 2>&1
+ /etc/init.d/ifupdown start > /dev/null 2>&1
+ /etc/init.d/networking start > /dev/null 2>&1
+
+ _NETWORK="true"
+ export _NETWORK
+ fi
+}
+
Main ()
{
if ! grep -qs "boot=live" /proc/cmdline
diff --git a/scripts/config/104-initramfs-tools b/scripts/config/104-initramfs-tools
index f57ce82..4f663ba 100755
--- a/scripts/config/104-initramfs-tools
+++ b/scripts/config/104-initramfs-tools
@@ -46,17 +46,24 @@ cat > /usr/sbin/update-initramfs << 'EOF'
# Updating initramfs
update-initramfs.debian "${@}"
+if [ -e /initrd.img ]
+then
+ _DIRECTORY=""
+else
+ _DIRECTORY="/boot"
+fi
+
# Copying kernel and initrd to live media
if [ -e /cdrom/live/initrd.lz ]
then
- zcat /initrd.img | lzma -9c >/cdrom/live/initrd.lz.new
+ zcat "${_DIRECTORY}/initrd.img" | lzma -9c > /cdrom/live/initrd.lz.new
mv /cdrom/live/initrd.lz.new /cdrom/live/initrd.lz
else
- cp /initrd.img /cdrom/live/initrd.gz.new
+ cp "${_DIRECTORY}/initrd.img" /cdrom/live/initrd.gz.new
mv /cdrom/live/initrd.gz.new /cdrom/live/initrd.gz
fi
-cp /vmlinuz /cdrom/live/vmlinuz.new
+cp "${_DIRECTORY}/vmlinuz" /cdrom/live/vmlinuz.new
mv /cdrom/live/vmlinuz.new /cdrom/live/vmlinuz
EOF
diff --git a/scripts/config/999-hooks b/scripts/config/999-hooks
index 2734bb5..d4b0450 100755
--- a/scripts/config/999-hooks
+++ b/scripts/config/999-hooks
@@ -32,18 +32,7 @@ Process_hooks ()
cp $(echo ${_HOOK} | sed 's|file\://||') "${_TMPFILE}"
else
# remote file
-
- if [ -z "${_NETWORK}" ] && [ -e /etc/init.d/live-config ]
- then
- /etc/init.d/mountkernfs.sh start > /dev/null 2>&1
- /etc/init.d/mountdevsubfs.sh start > /dev/null 2>&1
- /etc/init.d/ifupdown-clean start > /dev/null 2>&1
- /etc/init.d/ifupdown start > /dev/null 2>&1
- /etc/init.d/networking start > /dev/null 2>&1
-
- _NETWORK="true"
- export _NETWORK
- fi
+ Start_network
wget --quiet "${_HOOK}" -O "${_TMPFILE}"
fi
--
live-config
More information about the debian-live-changes
mailing list