[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-26-g948730f
Daniel Baumann
daniel at debian.org
Tue Jan 15 07:25:41 UTC 2008
The branch, master has been updated
via 948730f93a1a767fafb46c31845864538359e33c (commit)
via 3ea7ef688fb3018184444246d1786039e9e2f7e8 (commit)
via 52e7c9732de1d3c4b0003a817981505bb895448e (commit)
via 5b396d4fe7ca60699bda1cd0bbcbc6d515e56775 (commit)
via 13e554b1506f6bb0602f2f0ff2f5ef64f617dfb3 (commit)
via f3f923911054a72bb6ad3e6b0bc94b7311d5fcbf (commit)
via c6108d09b3f437c735c31bd7f57871ef269cc7c4 (commit)
via 4577edad2042c0c06c4e5518346dec5146237339 (commit)
via c837a9ebb44f5dd45cb5e7ce207673995b447a66 (commit)
via c833147b8d979c45042921d7495a8b8465f88606 (commit)
from fefba741836c83c195149763cbed1513a5310cba (commit)
- Shortlog ------------------------------------------------------------
948730f Consistently using the pipe as seperator in sed commands now.
3ea7ef6 Fixing changelog.
52e7c97 Move installing binary.deb/archives/*.deb.
5b396d4 Remove conditionals, as an expansion never 'fails': it just
13e554b Refactor installing file to binary/pool/main/./.* functionality.
f3f9239 Don't put more than one glob on a 'for' line, unless they are guaranteed
c6108d0 Don't prompt when autoremoving packages in minimal hooks.
4577eda Remove 'ssl' package references from mini and minimal hooks.
c837a9e Implement -v/--version and -h/--help in lh_clean.
c833147 Implement -u/--usage function in lh_clean (Closes: #454553)
Summary of changes:
debian/changelog | 6 ++
functions/conffile.sh | 6 +-
functions/defaults.sh | 16 +++---
functions/losetup.sh | 2 +-
functions/packages.sh | 2 +-
functions/packageslists.sh | 4 +-
helpers/lh | 2 +-
helpers/lh_binary_debian-installer | 96 +++++++++++++++------------------
helpers/lh_binary_disk | 2 +-
helpers/lh_binary_grub | 24 ++++----
helpers/lh_binary_includes | 6 +-
helpers/lh_binary_local-packageslists | 4 +-
helpers/lh_binary_rootfs | 2 +-
helpers/lh_binary_syslinux | 38 +++++++-------
helpers/lh_binary_usb-hdd | 2 +-
helpers/lh_binary_yaboot | 16 +++---
helpers/lh_chroot_hacks | 2 +-
helpers/lh_clean | 15 +++++-
helpers/lh_source_debian | 6 +-
helpers/lh_source_disk | 2 +-
hooks/mini | 2 +-
hooks/minimal | 4 +-
22 files changed, 135 insertions(+), 124 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 948730f93a1a767fafb46c31845864538359e33c
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jan 15 08:25:29 2008 +0100
Consistently using the pipe as seperator in sed commands now.
diff --git a/functions/conffile.sh b/functions/conffile.sh
index f60abe2..d0291e2 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -12,9 +12,9 @@ set -e
Read_conffile ()
{
FILES="${1} ${1}.${LH_ARCHITECTURE} ${1}.${DISTRIBUTION}"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//')"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//').${ARCHITECTURE}"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's/^lh_//').${DISTRIBUTION}"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
for FILE in ${FILES}
do
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a3ab9a1..e86163b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -436,24 +436,24 @@ Set_defaults ()
;;
gnome-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's/gnome-desktop//') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//') standard laptop gnome-desktop desktop"
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|gnome-desktop||') standard-x11"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|gnome-desktop||' -e 's|desktop||') standard laptop gnome-desktop desktop"
;;
kde-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's/kde-desktop//') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//') standard laptop kde-desktop desktop"
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|kde-desktop||') standard-x11"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|kde-desktop||' -e 's|desktop||') standard laptop kde-desktop desktop"
;;
xfce-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's/xfce-desktop//') standard-x11"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//') standard laptop xfce-desktop desktop"
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|laptop||' -e 's|xfce-desktop||' -e 's|desktop||') standard laptop xfce-desktop desktop"
;;
esac
done
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's/ //g')"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's/ //g')"
+ LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's| ||g')"
+ LH_TASKS="$(echo ${LH_TASKS} | sed -e 's| ||g')"
# Setting tasks
# LH_TASKS
diff --git a/functions/losetup.sh b/functions/losetup.sh
index b2a4f06..c3e90bc 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -27,7 +27,7 @@ Losetup ()
${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
else
- CYLINDERS="$(echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p")"
+ CYLINDERS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")"
OFFSET="$(expr ${CYLINDERS} '*' 512)"
Echo_message "Mounting ${DEVICE} with offset ${OFFSET}"
diff --git a/functions/packages.sh b/functions/packages.sh
index dadb007..645b6c4 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -89,7 +89,7 @@ Check_installed ()
INSTALL_STATUS=1
fi
else
- FILE="$(echo ${FILE} | sed -e 's/chroot//')"
+ FILE="$(echo ${FILE} | sed -e 's|chroot||')"
if [ ! -e "${FILE}" ]
then
diff --git a/functions/packageslists.sh b/functions/packageslists.sh
index 1ef64e3..cdec22c 100755
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@@ -34,9 +34,9 @@ Expand_packagelist_file ()
shift
shift
- for INCLUDE in $(sed -ne 's/^#<include> \(.*\)/\1/gp' "${FILE}");
+ for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' "${FILE}");
do
Expand_packagelist "${INCLUDE}" "${@}"
done
- sed -ne 's/^\([^#].*\)/\1\n/gp' "${FILE}"
+ sed -ne 's|^\([^#].*\)|\1\n|gp' "${FILE}"
}
diff --git a/helpers/lh b/helpers/lh
index 876bb6a..581e5f9 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -50,7 +50,7 @@ case "${1}" in
*)
if [ ! -z "$(whereis lh_${1})" ]
then
- exec lh_"${1}" $(echo ${@} | sed -e "s/${1}//")
+ exec lh_"${1}" $(echo ${@} | sed -e "s|${1}||")
else
Echo_error "no such helper"
exit 1
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 37db5a6..050f48f 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -123,11 +123,11 @@ Install_file() {
case "${SOURCE}" in
lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
;;
*)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
;;
esac
@@ -335,11 +335,11 @@ then
case "${SOURCE}" in
lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
;;
*)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
;;
esac
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 36f1984..88533e0 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -54,7 +54,7 @@ Create_lockfile .lock
mkdir -p binary/.disk
-ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')"
+ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 5a8cc7c..1d33ba8 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -189,7 +189,7 @@ then
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //')"
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@@ -199,20 +199,20 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Default entries
DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//')"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}"
for KERNEL in chroot/boot/vmlinuz-*
do
- VERSION="$(basename ${KERNEL} | sed -e 's/vmlinuz-//')"
+ VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}"
done
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g')"
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
@@ -238,14 +238,14 @@ then
Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g')"
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
MEMTEST="title\t\tOther:\nroot"
MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/$(basename ${DESTDIR_LIVE})/memtest"
- MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's#//#/#g')"
+ MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
fi
# Copying templates
@@ -264,7 +264,7 @@ esac
if [ "${LH_CHROOT_BUILD}" = "disabled" ]
then
- FILES="$(echo ${FILES} | sed -e 's/chroot//g')"
+ FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
fi
# Copying grub
@@ -293,18 +293,18 @@ then
rm -f binary/boot/grub/splash.xpm.gz
# Removing splash entry
- sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
+ sed -i -e "s|splashimage.*||" binary/boot/grub/menu.lst
else
# Overwriting splash file
cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
- sed -i -e "s#splashimage.*#splashimage /boot/grub/$(basename ${LH_GRUB_SPLASH})#" binary/boot/grub/menu.lst
+ sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/menu.lst
fi
fi
-sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" -e "s#MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" binary/boot/grub/menu.lst
+sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst
+sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
-sed -i -e 's/\ $//g' binary/boot/grub/menu.lst
+sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
# Saving cache
Save_cache cache/packages_binary
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index b4230a8..c2b2399 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -133,7 +133,7 @@ then
fi
# Adjusting install templates
- ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')"
+ ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
@@ -157,8 +157,8 @@ then
DEBIAN_TOOLS_TXT="/tools/"
fi
- sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
- sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
+ sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_HTML}|g" binary/README.html
+ sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
fi
# Creating stage file
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index 7355174..011386e 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -74,11 +74,11 @@ then
case "${SOURCE}" in
lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
;;
*)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
;;
esac
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 7871d77..2bd2a1f 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -185,7 +185,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
if [ "${LH_PACKAGES_LISTS}" = "minimal" ] || [ "${LH_PACKAGES_LISTS}" = "mini" ]
then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's,chroot/,,g')"
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
fi
if [ -f config/binary_rootfs/squashfs.sort ]
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index eff8d83..a217799 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -87,7 +87,7 @@ Syslinux_memtest_entry ()
# Write the menu label if the syslinux menu is being use
MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n"
MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
- MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's#//#/#g')"
+ MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
}
Syslinux_live_entry ()
@@ -182,7 +182,7 @@ Copy_syslinux_templates ()
cp "${TEMPLATES}"/menu/data/* ${DATA_PATH}
# Grab menu binary from chroot
- MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's,default\s*.*/\(.*menu.c32\)$,\1,g')
+ MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
fi
@@ -254,19 +254,19 @@ Configure_syslinux_templates ()
for template_file in ${templates}
do
- sed -i -e "s@{\$LINUX_LIVE}@${LINUX_LIVE}@" \
- -e "s@{\$LINUX_INSTALL}@${LINUX_INSTALL}@" \
- -e "s@{\$MEMTEST}@${MEMTEST}@" \
- -e "s@{\$LIVE_SCREEN_PATH}@${LIVE_SCREEN_PATH}@" \
- -e "s@{\$LIVE_DATA_PATH}@${LIVE_DATA_PATH}@" \
- -e "s@{\$LIVE_KERNEL_PATH}@${LIVE_KERNEL_PATH}@" \
- -e "s@{\$SPLASH}@${SPLASH}@" \
- -e "s/{\$LH_DISTRIBUTION}/${LH_DISTRIBUTION}/" \
- -e "s/{\$LH_DATE}/$(date +%Y%m%d)/" \
- -e "s/{\$LH_MEDIA}/${MEDIA}/" \
- -e "s/{\$LH_VERSION}/${VERSION}/" \
- -e "s/{\$LH_SYSLINUX_TIMEOUT}/${LH_SYSLINUX_TIMEOUT}0/" \
- -e 's/\ $//g' \
+ sed -i -e "s|{\$LINUX_LIVE}|${LINUX_LIVE}|" \
+ -e "s|{\$LINUX_INSTALL}|${LINUX_INSTALL}|" \
+ -e "s|{\$MEMTEST}|${MEMTEST}|" \
+ -e "s|{\$LIVE_SCREEN_PATH}|${LIVE_SCREEN_PATH}|" \
+ -e "s|{\$LIVE_DATA_PATH}|${LIVE_DATA_PATH}|" \
+ -e "s|{\$LIVE_KERNEL_PATH}|${LIVE_KERNEL_PATH}|" \
+ -e "s|{\$SPLASH}@|{SPLASH}|" \
+ -e "s|{\$LH_DISTRIBUTION}|${LH_DISTRIBUTION}|" \
+ -e "s|{\$LH_DATE}|$(date +%Y%m%d)|" \
+ -e "s|{\$LH_MEDIA}|${MEDIA}|" \
+ -e "s|{\$LH_VERSION}|${VERSION}|" \
+ -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
+ -e 's|\ $||g' \
$template_file
done
@@ -300,7 +300,7 @@ Configure_syslinux_templates ()
then
for FILE in ${SCREEN_PATH}/syslinux.cfg ${SCREEN_PATH}/boot.txt
do
- sed -i -e 's@/@@' ${FILE}
+ sed -i -e 's|/||' ${FILE}
done
fi
fi
@@ -468,7 +468,7 @@ then
esac
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //')"
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@@ -484,7 +484,7 @@ fi
# Default entries
DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//')"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
Syslinux_live_entry "live" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
@@ -495,7 +495,7 @@ then
if [ "${FLAVOUR}" != "${DEFAULT_FLAVOUR}" ]
then
FLAVOUR_KERNEL="$(basename chroot/boot/vmlinuz-*${FLAVOUR})"
- FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's/vmlinuz-//')"
+ FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's|vmlinuz-||')"
Syslinux_live_entry "live-${FLAVOUR}" "${LH_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
fi
done
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 3875cae..44eaac5 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -164,7 +164,7 @@ EOM
EOF
rootpartition="$(Chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')"
- usbdev="$(echo $rootpartition | sed -e 's/,[[:digit:]]//')"
+ usbdev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
echo "Root partition is $rootpartition, device is: $usbdev"
echo "WAITING..." && read WAIT
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index b02b221..2c51a66 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -197,7 +197,7 @@ then
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //')"
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
@@ -207,7 +207,7 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
# Default entries
DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's/vmlinux-//')"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')"
Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
@@ -217,7 +217,7 @@ then
for KERNEL in chroot/boot/vmlinux-*
do
KERNEL_IMAGE="$(basename ${KERNEL})"
- KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's/vmlinux-//')"
+ KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')"
INITRD="initrd.img-${KERNEL_VERSION}"
Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
@@ -225,7 +225,7 @@ then
done
fi
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g')"
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
@@ -249,7 +249,7 @@ then
Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
fi
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g')"
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
case "${LH_BINARY_IMAGES}" in
iso|usb-hdd)
@@ -277,9 +277,9 @@ case "${LH_BINARY_IMAGES}" in
fi
# Configure yaboot templates
- sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" binary/yaboot/yaboot.conf
- sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" binary/yaboot/yaboot.conf
- sed -i -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_VERSION/${VERSION}/" binary/yaboot/boot.msg
+ sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf
+ sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
+ sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" -e "s|LH_VERSION|${VERSION}|" binary/yaboot/boot.msg
;;
esac
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 5d9a4ac..1dd4850 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -133,7 +133,7 @@ then
do
DIRECTORY="$(dirname ${FILE})"
FILE="$(basename ${FILE})"
- RELATIVE_PATH="$(echo ${DIRECTORY} | sed 's/[^\/]\+/../g; s/^\///g')"
+ RELATIVE_PATH="$(echo ${DIRECTORY} | sed 's|[^/]\+|..|g; s|^/||g')"
# Touch files in case they don't yet exist
mkdir -p chroot/${DIRECTORY}
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index d1d025c..5e7fc89 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -98,15 +98,15 @@ rm -f chroot/root/dpkg-selection.txt
# Sort sources
for DSC in chroot/*.dsc
do
- SOURCE="$(sed -n 's/^Source: //p' ${DSC})"
+ SOURCE="$(sed -n 's|^Source: ||p' ${DSC})"
case "${SOURCE}" in
lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
;;
*)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
;;
esac
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index 433a710..509af74 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -54,7 +54,7 @@ Create_lockfile .lock
mkdir -p source/.disk
-ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')"
+ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
commit 3ea7ef688fb3018184444246d1786039e9e2f7e8
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jan 15 08:10:12 2008 +0100
Fixing changelog.
diff --git a/debian/changelog b/debian/changelog
index 6976912..c4b7ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
live-helper (1.0~a38-1) UNRELEASED; urgency=medium
- [Chris Lamb]
-
- * Implement -u/--usage, -v/--version and -h/--help options in lh_clean
- (Closes: #454553)
- * Remove 'ssl' package references from mini and minimal hooks.
- * Don't prompt when autoremoving packages in minimal hooks.
+ * New upstream release.
- -- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 23:32:58 +0000
+ -- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 00:00:00 +0100
live-helper (1.0~a37-2) unstable; urgency=medium
commit 52e7c9732de1d3c4b0003a817981505bb895448e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 02:47:29 2008 +0000
Move installing binary.deb/archives/*.deb.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 6b48139..37db5a6 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -252,13 +252,13 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
mv chroot/binary.deb ./
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+ for FILE in binary.deb/archives/*.deb
+ do
+ Install_file "${FILE}"
+ done
fi
-for FILE in binary.deb/archives/*.deb
-do
- Install_file "${FILE}"
-done
-
# Including base debian packages
if [ -d cache/packages_bootstrap ]
then
commit 5b396d4fe7ca60699bda1cd0bbcbc6d515e56775
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 02:44:41 2008 +0000
Remove conditionals, as an expansion never 'fails': it just
won't copy any files.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 81d535f..6b48139 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -254,13 +254,10 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
fi
-if ls binary.deb/archives/*.deb > /dev/null 2>&1
-then
- for FILE in binary.deb/archives/*.deb
- do
- Install_file "${FILE}"
- done
-fi
+for FILE in binary.deb/archives/*.deb
+do
+ Install_file "${FILE}"
+done
# Including base debian packages
if [ -d cache/packages_bootstrap ]
@@ -275,21 +272,15 @@ else
fi
# Including local debs
-if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
-then
- for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
- do
- Install_file "${FILE}"
- done
-fi
+for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+do
+ Install_file "${FILE}"
+done
-if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1
-then
- for FILE in ../config/binary_local-debs/*_all.deb
- do
- Install_file "${FILE}"
- done
-fi
+for FILE in ../config/binary_local-debs/*_all.deb
+do
+ Install_file "${FILE}"
+done
# Generating deb indices
mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}
commit 13e554b1506f6bb0602f2f0ff2f5ef64f617dfb3
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 02:43:42 2008 +0000
Refactor installing file to binary/pool/main/./.* functionality.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 0bf778c..81d535f 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -111,6 +111,33 @@ VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
+Install_file() {
+ local FILE="${1}"
+
+ SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ ;;
+
+ *)
+ LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+}
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LH_DISTRIBUTION}" = "etch" ]
then
@@ -231,28 +258,7 @@ if ls binary.deb/archives/*.deb > /dev/null 2>&1
then
for FILE in binary.deb/archives/*.deb
do
- SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
- ;;
-
- *)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ Install_file "${FILE}"
done
fi
@@ -261,28 +267,7 @@ if [ -d cache/packages_bootstrap ]
then
for FILE in cache/packages_bootstrap/*.deb
do
- SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
- ;;
-
- *)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ Install_file "${FILE}"
done
else
Echo_error "E: Could not find cache/packages_bootstrap"
@@ -294,28 +279,7 @@ if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
then
for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
do
- SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
- ;;
-
- *)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ Install_file "${FILE}"
done
fi
@@ -323,28 +287,7 @@ if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1
then
for FILE in ../config/binary_local-debs/*_all.deb
do
- SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
- if [ -z "${SOURCE}" ]
- then
- SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
- fi
-
- case "${SOURCE}" in
- lib?*)
- LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
- ;;
-
- *)
- LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
- ;;
- esac
-
- # Install directory
- mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
- # Move files
- cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ Install_file "${FILE}"
done
fi
commit f3f923911054a72bb6ad3e6b0bc94b7311d5fcbf
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 02:41:10 2008 +0000
Don't put more than one glob on a 'for' line, unless they are guaranteed
to succeed, otherwise the second one is not expanded and "*.deb" (for
example) is used literally.
This patch expands (haha) each "for" loop into it's own.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 056d89d..0bf778c 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -227,10 +227,39 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
fi
+if ls binary.deb/archives/*.deb > /dev/null 2>&1
+then
+ for FILE in binary.deb/archives/*.deb
+ do
+ SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ ;;
+
+ *)
+ LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ done
+fi
+
# Including base debian packages
if [ -d cache/packages_bootstrap ]
then
- for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
+ for FILE in cache/packages_bootstrap/*.deb
do
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
@@ -261,9 +290,38 @@ else
fi
# Including local debs
-if ls ../config/binary_local-debs/*.deb > /dev/null 2>&1
+if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
+then
+ for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+ do
+ SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+
+ if [ -z "${SOURCE}" ]
+ then
+ SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+ fi
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="$(echo ${SOURCE} | sed 's/\(....\).*/\1/')"
+ ;;
+
+ *)
+ LETTER="$(echo ${SOURCE} | sed 's/\(.\).*/\1/')"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+ done
+fi
+
+if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1
then
- for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb ../config/binary_local-debs/*_all.deb
+ for FILE in ../config/binary_local-debs/*_all.deb
do
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
commit c6108d09b3f437c735c31bd7f57871ef269cc7c4
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 01:34:01 2008 +0000
Don't prompt when autoremoving packages in minimal hooks.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index d6f0250..6976912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ live-helper (1.0~a38-1) UNRELEASED; urgency=medium
* Implement -u/--usage, -v/--version and -h/--help options in lh_clean
(Closes: #454553)
* Remove 'ssl' package references from mini and minimal hooks.
+ * Don't prompt when autoremoving packages in minimal hooks.
-- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 23:32:58 +0000
diff --git a/hooks/minimal b/hooks/minimal
index 7c36f7d..25d80f2 100755
--- a/hooks/minimal
+++ b/hooks/minimal
@@ -18,7 +18,7 @@ do
fi
done
-apt-get autoremove || true
+apt-get autoremove --yes || true
# Removing unused files
find . -name *~ | xargs rm -f
commit 4577edad2042c0c06c4e5518346dec5146237339
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 01:33:18 2008 +0000
Remove 'ssl' package references from mini and minimal hooks.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index 074d7be..d6f0250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ live-helper (1.0~a38-1) UNRELEASED; urgency=medium
* Implement -u/--usage, -v/--version and -h/--help options in lh_clean
(Closes: #454553)
+ * Remove 'ssl' package references from mini and minimal hooks.
-- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 23:32:58 +0000
diff --git a/hooks/mini b/hooks/mini
index e7f6ff1..9d99e81 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 dselect
+for PACKAGE in apt-utils aptitude man-db manpages info wget dselect
do
if ! apt-get remove --purge --yes "${PACKAGE}"
then
diff --git a/hooks/minimal b/hooks/minimal
index 5761abb..7c36f7d 100755
--- a/hooks/minimal
+++ b/hooks/minimal
@@ -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 wget
do
if ! apt-get remove --purge --yes "${PACKAGE}"
then
commit c837a9ebb44f5dd45cb5e7ce207673995b447a66
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 00:05:51 2008 +0000
Implement -v/--version and -h/--help in lh_clean.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index feafb22..074d7be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ live-helper (1.0~a38-1) UNRELEASED; urgency=medium
[Chris Lamb]
- * Implement -u/--usage function in lh_clean (Closes: #454553)
+ * Implement -u/--usage, -v/--version and -h/--help options in lh_clean
+ (Closes: #454553)
-- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 23:32:58 +0000
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 1e4e681..f835800 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -117,10 +117,18 @@ do
rm -f .stage/source*
;;
+ -h|--help)
+ Help
+ ;;
+
-u|--usage)
Usage
;;
+ -v|--version)
+ Version
+ ;;
+
*)
Usage
exit 1
commit c833147b8d979c45042921d7495a8b8465f88606
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 23:43:51 2008 +0000
Implement -u/--usage function in lh_clean (Closes: #454553)
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index 11fed74..feafb22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+live-helper (1.0~a38-1) UNRELEASED; urgency=medium
+
+ [Chris Lamb]
+
+ * Implement -u/--usage function in lh_clean (Closes: #454553)
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 14 Jan 2008 23:32:58 +0000
+
live-helper (1.0~a37-2) unstable; urgency=medium
* Disabling global arguments in lh_clean (Closes: #451960).
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 771b852..1e4e681 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -117,8 +117,13 @@ do
rm -f .stage/source*
;;
+ -u|--usage)
+ Usage
+ ;;
+
*)
- "${0}" --usage
+ Usage
+ exit 1
;;
esac
done
--
debian-live/live-helper
More information about the debian-live-changes
mailing list