Package: live-package Version: 0.99.5-1 Severity: Wishlist Tags: Patch Hi
Enclosed you find a patch for including a local_mirror. It is important to make sure the "component" is also changeable. Please check the patch as there might be some typos. Cheers Steffen
only in patch2:
unchanged:
--- live-package-0.99.5.orig/src/scripts/21image.sh
+++ live-package-0.99.5/src/scripts/21image.sh
@@ -20,6 +20,16 @@
echo "deb-src ${LIVE_MIRROR} oldstable ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb ${LIVE_MIRROR_SECURITY} oldstable/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR_SECURITY} oldstable/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ if [ -n "${LIVE_LOCAL_MIRROR}" ] ; then
+ if [ -n "${LIVE_LOCAL_SECTION}" ] ; then
+ echo "deb ${LIVE_LOCAL_MIRROR} oldstable ${LIVE_LOCAL_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
+ echo "deb-src ${LIVE_LOCAL_MIRROR} oldstable ${LIVE_LOCAL_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ else
+ echo "Please specify the --local-section option."
+ echo "This option is needed if --local-mirror is set."
+ exit 1
+ fi
+ fi
;;
stable)
@@ -27,6 +37,16 @@
echo "deb-src ${LIVE_MIRROR} stable ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb ${LIVE_MIRROR_SECURITY} stable/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR_SECURITY} stable/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ if [ -n "${LIVE_LOCAL_MIRROR}" ] ; then
+ if [ -n "${LIVE_LOCAL_SECTION}" ] ; then
+ echo "deb ${LIVE_LOCAL_MIRROR} stable ${LIVE_LOCAL_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
+ echo "deb-src ${LIVE_LOCAL_MIRROR} stable ${LIVE_LOCAL_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ else
+ echo "Please specify the --local-section option."
+ echo "This option is needed if --local-mirror is set."
+ exit 1
+ fi
+ fi
;;
testing)
@@ -36,11 +56,31 @@
echo "deb-src ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ if [ -n "${LIVE_LOCAL_MIRROR}" ] ; then
+ if [ -n "${LIVE_LOCAL_SECTION}" ] ; then
+ echo "deb ${LIVE_LOCAL_MIRROR} testing ${LIVE_LOCAL_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
+ echo "deb-src ${LIVE_LOCAL_MIRROR} testing ${LIVE_LOCAL_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ else
+ echo "Please specify the --local-section option."
+ echo "This option is needed if --local-mirror is set."
+ exit 1
+ fi
+ fi
;;
unstable)
echo "deb ${LIVE_MIRROR} unstable ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR} unstable ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ if [ -n "${LIVE_LOCAL_MIRROR}" ] ; then
+ if [ -n "${LIVE_LOCAL_SECTION}" ] ; then
+ echo "deb ${LIVE_LOCAL_MIRROR} unstable ${LIVE_LOCAL_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
+ echo "deb-src ${LIVE_LOCAL_MIRROR} unstable ${LIVE_LOCAL_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
+ else
+ echo "Please specify the --local-section option."
+ echo "This option is needed if --local-mirror is set."
+ exit 1
+ fi
+ fi
if [ "${LIVE_DISTRIBUTION_EXPERIMENTAL}" = "yes" ]
then
only in patch2:
unchanged:
--- live-package-0.99.5.orig/src/main.sh
+++ live-package-0.99.5/src/main.sh
@@ -45,7 +45,7 @@
{
echo "${PROGRAM} - utility to build Debian Live systems"
echo
- echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+ echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--local-mirror LOCAL_MIRROR] [--local-section LOCAL_SECTION] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
echo "Usage: ${PROGRAM} [-h|--help]"
echo "Usage: ${PROGRAM} [-u|--usage]"
echo "Usage: ${PROGRAM} [-v|--version]"
@@ -98,7 +98,7 @@
{
echo "${PROGRAM} - utility to build Debian Live systems"
echo
- echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+ echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--local-mirror LOCAL_MIRROR] [--local-section LOCAL_SECTION] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
echo "Usage: ${PROGRAM} [-h|--help]"
echo "Usage: ${PROGRAM} [-u|--usage]"
echo "Usage: ${PROGRAM} [-v|--version]"
@@ -155,7 +155,7 @@
Main ()
{
- ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- [EMAIL PROTECTED]"
+ ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,local-mirror:,local-section:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- [EMAIL PROTECTED]"
if [ "${?}" != "0" ]
then
@@ -246,6 +246,14 @@
LIVE_KERNEL="${2}"; shift 2
;;
+ --local-mirror)
+ LIVE_LOCAL_MIRROR="${2}"; shift 2
+ ;;
+
+ --local-section)
+ LIVE_LOCAL_SECTION="${2}"; shift 2
+ ;;
+
-m|--mirror)
LIVE_MIRROR="${2}"; shift 2
;;
pgpX1oBBvpllT.pgp
Description: PGP signature
_______________________________________________ Debian-live-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
