[SCM] live-boot branch, upstream, updated. upstream/2.0_a1-1-gef5358e
Daniel Baumann
daniel at debian.org
Thu May 27 20:51:40 UTC 2010
The following commit has been merged in the upstream branch:
commit ef5358e6ff01441de420298f756f497cf131b3d5
Author: Daniel Baumann <daniel at debian.org>
Date: Thu May 27 22:45:08 2010 +0200
Adding upstream version 2.0~a2.
diff --git a/Makefile b/Makefile
index 1018daf..eadd5d7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,14 @@ SHELL := sh -e
LANGUAGES = de
+SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
+
all: test build
test:
@echo -n "Checking for syntax errors"
- @for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
+ @for SCRIPT in $(SCRIPTS); \
do \
sh -n $${SCRIPT}; \
echo -n "."; \
@@ -22,7 +24,7 @@ test:
@# We can't just fail yet on bashisms (FIXME)
@if [ -x /usr/bin/checkbashisms ]; \
then \
- for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
+ for SCRIPT in $(SCRIPTS); \
do \
checkbashisms $${SCRIPT} || true; \
echo -n "."; \
diff --git a/VERSION b/VERSION
index 3ca84b6..0a140b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a1
+2.0~a2
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 9bc588e..50a8cd3 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 24.05.2010 2.0~a1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 27.05.2010 2.0~a2 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 8cd94b7..46b3b4e 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 24.05.2010 2.0~a1 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 27.05.2010 2.0~a2 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 2b45a6f..2b940e3 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-05\-24 2.0~a1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-05\-27 2.0~a2 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 987ad1e..a08e92f 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-05\-24 2.0~a1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-05\-27 2.0~a2 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 04c966b..8b3a693 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-05-24"
-msgstr "24.05.2010"
+msgid "2010-05-27"
+msgstr "27.05.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a1"
-msgstr "2.0~a1"
+msgid "2.0~a2"
+msgstr "2.0~a2"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 3bdfc7b..55ba56f 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-05-24"
-msgstr "24.05.2010"
+msgid "2010-05-27"
+msgstr "27.05.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a1"
-msgstr "2.0~a1"
+msgid "2.0~a2"
+msgstr "2.0~a2"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index f799d62..7e7a557 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-05-24 12:46+0300\n"
+"POT-Creation-Date: 2010-05-27 22:42+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-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-05-24"
+msgid "2010-05-27"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a1"
+msgid "2.0~a2"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 190028b..a088e4b 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-05-24 12:46+0300\n"
+"POT-Creation-Date: 2010-05-27 22:42+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-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-05-24"
+msgid "2010-05-27"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a1"
+msgid "2.0~a2"
msgstr ""
#. type: TH
diff --git a/scripts/live b/scripts/live
index 4169c90..afe0f4b 100755
--- a/scripts/live
+++ b/scripts/live
@@ -59,13 +59,12 @@ Arguments ()
NOFASTBOOT="Yes"
NOFSTAB="Yes"
NOHOSTS="Yes"
- NOLOCALES="Yes"
NONETWORKING="Yes"
NOTIMEZONE="Yes"
NOXAUTOCONFIG="Yes"
NOXAUTOLOGIN="Yes"
- export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NOLOCALES NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
+ export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
;;
access=*)
@@ -213,17 +212,6 @@ Arguments ()
export LIVE_MEDIA_TIMEOUT
;;
- language=*|debian-installer/language=*)
- language=${x#debian-installer/language=}
- locale="$(lang2locale "$language")"
- set_locale="true"
- ;;
-
- locale=*|debian-installer/locale=*)
- LOCALE="${ARGUMENT#*=}"
- export LOCALE
- ;;
-
module=*)
MODULE="${ARGUMENT#module=}"
export MODULE
@@ -284,11 +272,6 @@ Arguments ()
export NOHOSTS
;;
- nolocales)
- NOLOCALES="Yes"
- export NOLOCALES
- ;;
-
nonetworking)
NONETWORKING="Yes"
export NONETWORKING
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
deleted file mode 100755
index e53e487..0000000
--- a/scripts/live-bottom/14locales
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-boot header
-
-if [ -n "${NOLOCALES}" ]
-then
- exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up locales"
-
-# Cosmetic line wrapping for output of local-gen
-echo
-
-# live-boot script
-
-if [ -e /root/etc/default/locale ]
-then
- grep_file=/root/etc/default/locale
-elif [ -e /root/etc/environment ]
-then
- # Old locales policy
- grep_file=/root/etc/environment
-fi
-
-if [ -n "${grep_file}" ]
-then
- # use rootfs configured locale
- locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-fi
-
-if [ -n "${LOCALE}" ]
-then
- locale="${LOCALE}"
- set_locale="true"
-fi
-
-if [ -z "${locale}" ]
-then
- # Set a default one
- locale=en_US.UTF-8
- set_locale="true"
-fi
-
-if [ "${set_locale}" ]
-then
- if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$'
- then
- # input is like "locale=it", so we will convert and setup also the keyboard if not already set
- if [ -z "${KBD}" ]
- then
- # FIXME: look if this keyb is supported
- KBD="${locale}"
- really_export KBD
- fi
-
- uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
- locale="${locale}_${uploc}.UTF-8"
- fi
-
- LANG=
- language="$(echo ${locale} | cut -d. -f1)"
- eval $(awk '/^'"${locale}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
-
- if [ -z "${LANG}" ]
- then
- # Try and fallback to another codepage for this language.
- eval $(awk '/^'"${language}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
-
- if [ -n "${LANG}" ]
- then
- log_warning_msg "Choosing locale '${LANG}' as '${locale}' is unsupported."
- fi
- fi
-
- if [ -z "${LANG}" ]
- then
- log_warning_msg "Locale '${locale}' is unsupported."
- codepage="UTF-8"
- language="en_US"
- locale="${language}.${codepage}"
- LANG="${language}.${codepage}"
- fi
-
- if [ -d /root/etc/default/kdm.d/ ]
- then
- if ! grep -qs "^LANGUAGE" "${LANG}"
- then
- printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
- fi
- elif [ -f /root/etc/kde3/kdm/kdmrc ]
- then
- sed -i -r -e "s/#Language=.*/Language=${language}/" \
- /root/etc/kde3/kdm/kdmrc
- fi
-
- really_export LANG
-
- printf 'LANG="%s"\n' "${LANG}" > /root/etc/default/locale
- printf 'LANG="%s"\n' "${LANG}" > /root/etc/environment
- printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
-
- if [ -z "${SILENT}" ]
- then
- chroot /root /usr/sbin/locale-gen
- else
- chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
- fi
-fi
-
-log_end_msg
--
live-boot
More information about the debian-live-changes
mailing list