[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-15-g9bb8908
Daniel Baumann
daniel at debian.org
Thu Sep 13 05:55:17 UTC 2007
The branch, master has been updated
via 9bb89083c1fb3377fc9be6cf01bdf8bf205f6455 (commit)
via 8f7224173db44a630686d3c0ebad78baf6db0ce0 (commit)
from 727d6649df0b09f6ebc6f1ec4692a83a6e24b121 (commit)
- Shortlog ------------------------------------------------------------
9bb8908 functions/defaults.sh
8f72241 helpers/lh_binary_syslinux
Summary of changes:
functions/defaults.sh | 2 +-
helpers/lh_binary_syslinux | 9 +++++--
templates/syslinux/boot.txt | 3 --
templates/syslinux/common/splash.rle | Bin 0 -> 10489 bytes
templates/syslinux/common/syslinux.cfg | 36 ++++++++++++++++++++++++++++++
templates/syslinux/en/boot.txt | 3 ++
templates/syslinux/en/f1.txt.install | 25 ++++++++++++++++++++
templates/syslinux/en/f1.txt.live | 25 ++++++++++++++++++++
templates/syslinux/en/f10.txt | 23 +++++++++++++++++++
templates/syslinux/en/f2.txt.install | 23 +++++++++++++++++++
templates/syslinux/en/f2.txt.live | 23 +++++++++++++++++++
templates/syslinux/en/f3.txt.install | 23 +++++++++++++++++++
templates/syslinux/en/f3.txt.install.g-i | 23 +++++++++++++++++++
templates/syslinux/en/f3.txt.live | 23 +++++++++++++++++++
templates/syslinux/en/f4.txt.install | 23 +++++++++++++++++++
templates/syslinux/en/f4.txt.install.g-i | 23 +++++++++++++++++++
templates/syslinux/en/f4.txt.live | 23 +++++++++++++++++++
templates/syslinux/en/f5.txt | 23 +++++++++++++++++++
templates/syslinux/en/f6.txt | 23 +++++++++++++++++++
templates/syslinux/en/f7.txt | 23 +++++++++++++++++++
templates/syslinux/en/f8.txt.install | 23 +++++++++++++++++++
templates/syslinux/en/f8.txt.live | 23 +++++++++++++++++++
templates/syslinux/en/f9.txt.install | 23 +++++++++++++++++++
templates/syslinux/en/f9.txt.live | 23 +++++++++++++++++++
templates/syslinux/f1.txt.install | 25 --------------------
templates/syslinux/f1.txt.live | 25 --------------------
templates/syslinux/f10.txt | 23 -------------------
templates/syslinux/f2.txt.install | 23 -------------------
templates/syslinux/f2.txt.live | 23 -------------------
templates/syslinux/f3.txt.install | 23 -------------------
templates/syslinux/f3.txt.install.g-i | 23 -------------------
templates/syslinux/f3.txt.live | 23 -------------------
templates/syslinux/f4.txt.install | 23 -------------------
templates/syslinux/f4.txt.install.g-i | 23 -------------------
templates/syslinux/f4.txt.live | 23 -------------------
templates/syslinux/f5.txt | 23 -------------------
templates/syslinux/f6.txt | 23 -------------------
templates/syslinux/f7.txt | 23 -------------------
templates/syslinux/f8.txt.install | 23 -------------------
templates/syslinux/f8.txt.live | 23 -------------------
templates/syslinux/f9.txt.install | 23 -------------------
templates/syslinux/f9.txt.live | 23 -------------------
templates/syslinux/splash.rle | Bin 10489 -> 0 bytes
templates/syslinux/syslinux.cfg | 36 ------------------------------
44 files changed, 464 insertions(+), 461 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 9bb89083c1fb3377fc9be6cf01bdf8bf205f6455
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 07:55:05 2007 +0200
functions/defaults.sh
* Setting default language to 'en'.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 05b1e0d..e52b319 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -444,7 +444,7 @@ Set_defaults ()
esac
# Setting language string
- # LH_LANGUAGE
+ LH_LANGUAGE="${LH_LANGUAGE:-en}"
# Setting linux flavour string
if [ -z "${LH_LINUX_FLAVOURS}" ]
commit 8f7224173db44a630686d3c0ebad78baf6db0ce0
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 13 07:54:10 2007 +0200
helpers/lh_binary_syslinux
templates/syslinux/*
* Supporting localized syslinux templates based on LH_LANGUAGE.
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 968d250..4bcbda8 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -335,7 +335,8 @@ case "${LH_BINARY_IMAGES}" in
;;
esac
- cp -r "${TEMPLATES}"/* binary/isolinux
+ cp -r "${TEMPLATES}"/common/* binary/isolinux
+ cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux
for FILE in binary/isolinux/*.live
do
@@ -436,7 +437,8 @@ case "${LH_BINARY_IMAGES}" in
esac
mkdir -p tftpboot/pxelinux.cfg
- cp -r "${TEMPLATES}"/* tftpboot/pxelinux.cfg
+ cp -r "${TEMPLATES}"/common/* tftpboot/pxelinux.cfg
+ cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* tftpboot/pxelinux.cfg
for FILE in tftpboot/pxelinux.cfg/*.live
do
@@ -533,7 +535,8 @@ case "${LH_BINARY_IMAGES}" in
;;
esac
- cp -r "${TEMPLATES}"/* "${DESTDIR}"
+ cp -r "${TEMPLATES}"/common/* "${DESTDIR}"
+ cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* "${DESTDIR}"
for FILE in "${DESTDIR}"/*.live
do
diff --git a/contrib/syslinux-splash/live.rle b/templates/syslinux/common/splash.rle
similarity index 100%
copy from contrib/syslinux-splash/live.rle
copy to templates/syslinux/common/splash.rle
diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
similarity index 100%
rename from templates/syslinux/syslinux.cfg
rename to templates/syslinux/common/syslinux.cfg
diff --git a/templates/syslinux/boot.txt b/templates/syslinux/en/boot.txt
similarity index 100%
rename from templates/syslinux/boot.txt
rename to templates/syslinux/en/boot.txt
diff --git a/templates/syslinux/f1.txt.install b/templates/syslinux/en/f1.txt.install
similarity index 100%
rename from templates/syslinux/f1.txt.install
rename to templates/syslinux/en/f1.txt.install
diff --git a/templates/syslinux/f1.txt.live b/templates/syslinux/en/f1.txt.live
similarity index 100%
rename from templates/syslinux/f1.txt.live
rename to templates/syslinux/en/f1.txt.live
diff --git a/templates/syslinux/f10.txt b/templates/syslinux/en/f10.txt
similarity index 100%
rename from templates/syslinux/f10.txt
rename to templates/syslinux/en/f10.txt
diff --git a/templates/syslinux/f2.txt.install b/templates/syslinux/en/f2.txt.install
similarity index 100%
rename from templates/syslinux/f2.txt.install
rename to templates/syslinux/en/f2.txt.install
diff --git a/templates/syslinux/f2.txt.live b/templates/syslinux/en/f2.txt.live
similarity index 100%
rename from templates/syslinux/f2.txt.live
rename to templates/syslinux/en/f2.txt.live
diff --git a/templates/syslinux/f3.txt.install b/templates/syslinux/en/f3.txt.install
similarity index 100%
rename from templates/syslinux/f3.txt.install
rename to templates/syslinux/en/f3.txt.install
diff --git a/templates/syslinux/f3.txt.install.g-i b/templates/syslinux/en/f3.txt.install.g-i
similarity index 100%
rename from templates/syslinux/f3.txt.install.g-i
rename to templates/syslinux/en/f3.txt.install.g-i
diff --git a/templates/syslinux/f3.txt.live b/templates/syslinux/en/f3.txt.live
similarity index 100%
rename from templates/syslinux/f3.txt.live
rename to templates/syslinux/en/f3.txt.live
diff --git a/templates/syslinux/f4.txt.install b/templates/syslinux/en/f4.txt.install
similarity index 100%
rename from templates/syslinux/f4.txt.install
rename to templates/syslinux/en/f4.txt.install
diff --git a/templates/syslinux/f4.txt.install.g-i b/templates/syslinux/en/f4.txt.install.g-i
similarity index 100%
rename from templates/syslinux/f4.txt.install.g-i
rename to templates/syslinux/en/f4.txt.install.g-i
diff --git a/templates/syslinux/f4.txt.live b/templates/syslinux/en/f4.txt.live
similarity index 100%
rename from templates/syslinux/f4.txt.live
rename to templates/syslinux/en/f4.txt.live
diff --git a/templates/syslinux/f5.txt b/templates/syslinux/en/f5.txt
similarity index 100%
rename from templates/syslinux/f5.txt
rename to templates/syslinux/en/f5.txt
diff --git a/templates/syslinux/f6.txt b/templates/syslinux/en/f6.txt
similarity index 100%
rename from templates/syslinux/f6.txt
rename to templates/syslinux/en/f6.txt
diff --git a/templates/syslinux/f7.txt b/templates/syslinux/en/f7.txt
similarity index 100%
rename from templates/syslinux/f7.txt
rename to templates/syslinux/en/f7.txt
diff --git a/templates/syslinux/f8.txt.install b/templates/syslinux/en/f8.txt.install
similarity index 100%
rename from templates/syslinux/f8.txt.install
rename to templates/syslinux/en/f8.txt.install
diff --git a/templates/syslinux/f8.txt.live b/templates/syslinux/en/f8.txt.live
similarity index 100%
rename from templates/syslinux/f8.txt.live
rename to templates/syslinux/en/f8.txt.live
diff --git a/templates/syslinux/f9.txt.install b/templates/syslinux/en/f9.txt.install
similarity index 100%
rename from templates/syslinux/f9.txt.install
rename to templates/syslinux/en/f9.txt.install
diff --git a/templates/syslinux/f9.txt.live b/templates/syslinux/en/f9.txt.live
similarity index 100%
rename from templates/syslinux/f9.txt.live
rename to templates/syslinux/en/f9.txt.live
diff --git a/templates/syslinux/splash.rle b/templates/syslinux/splash.rle
deleted file mode 100644
index df3e15d..0000000
Binary files a/templates/syslinux/splash.rle and /dev/null differ
--
debian-live/live-helper
More information about the debian-live-changes
mailing list