[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] Add support for custom debian installer images mirror



Hi Daniel,

On Mon, Dec 14, 2009 at 5:08 AM, Daniel Baumann <daniel@debian.org> wrote:
Daniel Baumann wrote:
nice, thanks. could you please also add --mirror-debian-installer to
lh_config and document it in the manpage of lh_config?

ping

Please find updated patch attached.

Cheers,

--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-613-401-5141
Email: cody.somerville@canonical.com
=== modified file 'functions/defaults.sh'
--- functions/defaults.sh	2009-09-02 14:10:05 +0000
+++ functions/defaults.sh	2009-10-04 05:06:35 +0000
@@ -316,6 +316,7 @@
 	fi
 
 	LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT:-${LH_MIRROR_BOOTSTRAP}}"
+	LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_CHROOT}}"
 
 	# Setting security mirror to fetch packages from
 	if [ -z "${LH_MIRROR_CHROOT_SECURITY}" ]

=== modified file 'helpers/lh_binary_debian-installer'
--- helpers/lh_binary_debian-installer	2009-09-02 05:39:13 +0000
+++ helpers/lh_binary_debian-installer	2009-10-04 05:06:37 +0000
@@ -252,7 +270,10 @@
 	esac
 fi
 
-if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
+if [ -n "${LH_DEBIAN_INSTALLER_URL}" ]
+then
+    URL="${LH_DEBIAN_INSTALLER_URL}"
+elif [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
 then
 	LH_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
@@ -288,7 +309,7 @@
 			;;
 	esac
 else
-	URL="${LH_MIRROR_CHROOT}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
+	URL="${LH_MIRROR_DEBIAN_INSTALLER}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
 fi
 
 mkdir -p "${DESTDIR_DI}"

=== modified file 'helpers/lh_config'
--- helpers/lh_config	2009-09-07 16:22:33 +0000
+++ helpers/lh_config	2009-12-17 11:57:01 +0000
@@ -93,6 +93,7 @@
 \t    [--mirror-chroot-security URL]\n\
 \t    [--mirror-binary URL]\n\
 \t    [--mirror-binary-security URL]\n\
+\t    [--mirror-debian-installer URL]\n\
 \t    [--mode debian|emdebian]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
@@ -135,10 +136,10 @@
 		initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
-		mirror-binary-security:,categories:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
-		hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
-		packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
-		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
+		mirror-binary-security:,mirror-debian-installer:,categories:,chroot-filesystem:,union-filesystem:,
+		exposed-root:,virtual-root-size:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,
+		linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,
+		binary-images:,binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,
 		iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
@@ -403,6 +404,11 @@
 				shift 2
 				;;
 
+			--mirror-debian-installer)
+				LH_MIRROR_DEBIAN_INSTALLER="${2}"
+				shift 2
+				;;
+
 			--categories)
 				LH_CATEGORIES="${2}"
 				shift 2
@@ -1089,6 +1095,10 @@
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
 LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
 
+# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer suite
+# (Default: ${LH_MIRROR_CHROOT})
+LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
+
 # \$LH_DEBIAN_INSTALLER: set debian-installer
 # (Default: ${LH_DEBIAN_INSTALLER})
 LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"

=== modified file 'manpages/lh_config.en.1'
--- manpages/lh_config.en.1	2009-09-07 16:22:33 +0000
+++ manpages/lh_config.en.1	2009-12-17 12:00:19 +0000
@@ -134,6 +134,8 @@
 .br
 	[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
 .br
+	[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
+.br
 	[\fB\-\-mode\fR debian|emdebian|ubuntu]
 .br
 	[\fB\-\-net\-root\-filesystem\fR nfs|cfs]
@@ -336,6 +338,8 @@
 sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://ftp.us.debian.org/debian/ which may not be a good default if you live outside the U.S.
 .IP "\fB\-\-mirror\-chroot\-security\fR \fIURL\fR" 4
 sets the location of the debian security package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://security.debian.org/debian/.
+.IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
+sets the location of the mirror that will be used to fetch the debian installer images. By default, this points to the same mirror used to build the live system.
 .IP "\fB\-\-mode\fR debian|emdebian|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
 .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4


Reply to: