[SCM] debian-live/live-helper branch, master, updated. 1.0_a30-1-8-ga516cac
Daniel Baumann
daniel at debian.org
Mon Oct 8 08:15:14 UTC 2007
The branch, master has been updated
via a516cac94f08fc243de8dc236f0c37e6ec05051e (commit)
via e1f157ee2c39ef93a028e0f42874838897bca7b0 (commit)
via aed8d437acfb9ac32f79f695886e434e891538f8 (commit)
via c5a9b5a6c31397036632523a10eaa7a57438e055 (commit)
via acae5a0519d03180eef930fb507850014a75ebd4 (commit)
via ec823a8c3c5719ad86fe69555fd394b1b4f07464 (commit)
via 33ad814b5a9a948fdba1a842ce82cb4d1703b790 (commit)
from 9262ebeb9259eb7431985c5e3b0c9bf120a81007 (commit)
- Shortlog ------------------------------------------------------------
a516cac templates: change font used on syslinux menu to a better one
e1f157e iso: use -allow-multidot option when calling genisoimage
aed8d43 syslinux: force latin1 encoding on texts used for labels
c5a9b5a bootstrap: add support to include and exclude packages
acae5a0 hooks/mini: remove dselect package since it's mostly unused now
ec823a8 iso: move mini and minimal flavors assigment to a cannonical place
33ad814 cdebootstrap: simplified code using case instead of if's so it's easier to read
Summary of changes:
functions/defaults.sh | 6 ++++
helpers/lh_binary_iso | 41 +++++++++++----------------
helpers/lh_binary_syslinux | 10 ++++++-
helpers/lh_bootstrap_cdebootstrap | 33 +++++++++++++++-------
helpers/lh_bootstrap_debootstrap | 10 +++++++
helpers/lh_config | 8 +++++
hooks/mini | 2 +-
templates/syslinux/menu/data/iso01.f14.psf | Bin 0 -> 4556 bytes
templates/syslinux/menu/data/lat1-16.psf | Bin 5156 -> 0 bytes
templates/syslinux/menu/header.cfg | 2 +-
10 files changed, 75 insertions(+), 37 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit a516cac94f08fc243de8dc236f0c37e6ec05051e
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Oct 4 20:18:07 2007 -0300
templates: change font used on syslinux menu to a better one
Previous used font had a bug with some chars and was also too big for
general use so a smaller and right one has been choosen.
diff --git a/templates/syslinux/menu/data/iso01.f14.psf b/templates/syslinux/menu/data/iso01.f14.psf
new file mode 100644
index 0000000..0cc056a
Binary files /dev/null and b/templates/syslinux/menu/data/iso01.f14.psf differ
diff --git a/templates/syslinux/menu/data/lat1-16.psf b/templates/syslinux/menu/data/lat1-16.psf
deleted file mode 100644
index 097a640..0000000
Binary files a/templates/syslinux/menu/data/lat1-16.psf and /dev/null differ
diff --git a/templates/syslinux/menu/header.cfg b/templates/syslinux/menu/header.cfg
index 30878ae..9452115 100644
--- a/templates/syslinux/menu/header.cfg
+++ b/templates/syslinux/menu/header.cfg
@@ -1,5 +1,5 @@
-font data/lat1-16.psf
default data/vesamenu.c32
+font data/iso01.f14.psf
timeout 1000
prompt 0
commit e1f157ee2c39ef93a028e0f42874838897bca7b0
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Oct 4 20:35:28 2007 -0300
iso: use -allow-multidot option when calling genisoimage
To properly support syslinux menus we need to provide fonts (specially
when using accents and like) and those files are usually found on
systems using multiple dots on their filenames (e.g iso01.f14.psf) and
then makes sense to support this by default or our users can spent _a
lot_ of time to sort this kind of problem out.
While doing it, the duplicated command line has been removed and code
changed to avoid this duplication making future changes need to touch
just one place.
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 11280ee..781a007 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -130,15 +130,16 @@ case "${LH_PACKAGES_LISTS}" in
;;
esac
+cat > binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary
+EOF
+
case "${LH_CHROOT_BUILD}" in
enabled)
# Moving image
+ mv binary.sh chroot
mv binary chroot
-cat > chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
-EOF
-
Chroot "sh binary.sh"
# Move image
@@ -147,10 +148,6 @@ EOF
;;
disabled)
-cat > binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
-EOF
-
sh binary.sh
rm -f binary.sh
;;
commit aed8d437acfb9ac32f79f695886e434e891538f8
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Oct 4 20:18:04 2007 -0300
syslinux: force latin1 encoding on texts used for labels
syslinux cannot handle utf-8 encoding and then proper encoding needed
to be enforced while printing the label texts.
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 655a424..ca6d7c8 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -68,10 +68,17 @@ Restore_cache cache/packages_binary
Install_package
# Local functions
+Utf8_to_latin1 ()
+{
+ VALUE="${1}"
+
+ echo "${VALUE}" | iconv -f utf-8 -t latin1
+}
+
Syslinux_memtest_entry ()
{
LABEL="${1}"
- MENULABEL="${2}"
+ MENULABEL=`Utf8_to_latin1 "${2}"`
KERNEL="${3}"
# syslinux << 3.36 lacks support to file/path
@@ -92,6 +99,7 @@ Syslinux_memtest_entry ()
Syslinux_live_entry ()
{
LABEL="${1}"
+ MENULABEL=`Utf8_to_latin1 "${2}"`
MENULABEL="${2}"
KERNEL="${3}"
INITRD="${4}"
commit c5a9b5a6c31397036632523a10eaa7a57438e055
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Sep 27 21:54:23 2007 -0300
bootstrap: add support to include and exclude packages
To allow better customization of resulting system, support to include
and exclude packages of base system has been added. It has been
included for debootstrap and cdebootstrap helpers.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5d971d8..994bc2b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -278,6 +278,12 @@ Set_defaults ()
fi
fi
+ # Include packages on base
+ # LH_BOOTSTRAP_INCLUDE
+
+ # Exclude packages on base
+ # LH_BOOTSTRAP_EXCLUDE
+
# Setting distribution configuration value
# LH_BOOTSTRAP_CONFIG
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 084a378..e2b627b 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -69,6 +69,16 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}"
fi
+if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=${LH_BOOTSTRAP_INCLUDE}"
+fi
+
+if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+then
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=${LH_BOOTSTRAP_EXCLUDE}"
+fi
+
if [ -n "${LH_BOOTSTRAP_KEYRING}" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 99df978..3be3968 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -69,6 +69,16 @@ then
LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
fi
+if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=${LH_BOOTSTRAP_INCLUDE}"
+fi
+
+if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=${LH_BOOTSTRAP_EXCLUDE}"
+fi
+
if [ "${LH_VERBOSE}" = "true" ]
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
diff --git a/helpers/lh_config b/helpers/lh_config
index bfcb316..2b279cd 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -722,6 +722,14 @@ LH_ARCHITECTURE="${LH_ARCHITECTURE}"
# (Default: empty)
LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}"
+# \$LH_BOOTSTRAP_INCLUDE: include packages on base
+# (Default: empty)
+LH_BOOTSTRAP_INCLUDE="${LH_BOOTSTRAP_INCLUDE}"
+
+# \$LH_BOOTSTRAP_EXCLUDE: exclude packages on base
+# (Default: empty)
+LH_BOOTSTRAP_EXCLUDE="${LH_BOOTSTRAP_EXCLUDE}"
+
# \$LH_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: ${LH_BOOTSTRAP_FLAVOUR})
LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}"
commit acae5a0519d03180eef930fb507850014a75ebd4
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Sep 27 10:05:15 2007 -0300
hooks/mini: remove dselect package since it's mostly unused now
diff --git a/hooks/mini b/hooks/mini
index dda40bc..5a296d5 100755
--- a/hooks/mini
+++ b/hooks/mini
@@ -10,7 +10,7 @@
set -e
# Removing unused packages
-for PACKAGE in apt-utils aptitude man-db manpages info ssl wget
+for PACKAGE in apt-utils aptitude man-db manpages info ssl wget dselect
do
if ! apt-get remove --purge --yes "${PACKAGE}"
then
commit ec823a8c3c5719ad86fe69555fd394b1b4f07464
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Sep 27 09:58:02 2007 -0300
iso: move mini and minimal flavors assigment to a cannonical place
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 82ba2a9..11280ee 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -102,30 +102,20 @@ case "${LH_BOOTLOADER}" in
grub)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
-
- if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
- fi
+ GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
;;
syslinux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
-
- if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
- fi
+ GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
;;
yaboot)
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map binary/yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
-
- if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
- then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m yaboot/hfs.map"
- fi
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+ GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
;;
*)
@@ -134,6 +124,12 @@ case "${LH_BOOTLOADER}" in
;;
esac
+case "${LH_PACKAGES_LISTS}" in
+ minimal|mini)
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+ ;;
+esac
+
case "${LH_CHROOT_BUILD}" in
enabled)
# Moving image
commit 33ad814b5a9a948fdba1a842ce82cb4d1703b790
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Thu Sep 27 09:45:47 2007 -0300
cdebootstrap: simplified code using case instead of if's so it's easier to read
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index b192858..084a378 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -74,12 +74,14 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
fi
-if [ "${LH_PACKAGES_LISTS}" != "minimal" ] && [ "${LH_PACKAGES_LISTS}" != "mini" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-else
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-fi
+case "${LH_PACKAGES_LISTS}" in
+ minimal|mini)
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+ ;;
+ *)
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
+ ;;
+esac
if [ "${LH_DEBUG}" = "enabled" ]
then
@@ -137,10 +139,11 @@ then
fi
# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
- if [ "${LH_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LH_BOOTSTRAP_FLAVOUR}" = "mini" ]
- then
- Chroot "dpkg -P cdebootstrap-helper-diverts"
- fi
+ case "${LH_PACKAGES_LISTS}" in
+ minimal|mini)
+ Chroot "dpkg -P cdebootstrap-helper-diverts"
+ ;;
+ esac
# Deconfiguring cdebootstrap configurations
rm -f chroot/etc/apt/sources.list
--
debian-live/live-helper
More information about the debian-live-changes
mailing list