summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_includes15
-rwxr-xr-xhelpers/lh_config14
2 files changed, 27 insertions, 2 deletions
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 6954377..c90e75c 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -164,5 +164,20 @@ then
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
+# Copying win32-loader
+if [ "${LH_WIN32_LOADER}" = "enabled" ]
+then
+ case "${LH_ARCHITECTURE}" in
+ amd64|i386)
+ if Find_files /usr/lib/win32-loader/*
+ then
+ cp /usr/lib/win32-loader/* binary
+ else
+ Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
+ fi
+ ;;
+ esac
+fi
+
# Creating stage file
Create_stagefile .stage/binary_includes
diff --git a/helpers/lh_config b/helpers/lh_config
index f7f0cbd..f7a46e2 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -114,11 +114,12 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--union-filesystem aufs|unionfs]\n\
\t [--exposed-root enabled|disabled]\n\
\t [--username NAME]\n\
-\t [--verbose]"
+\t [--verbose]\n\"
+\t [--win32-loader enabled|disabled]"
Local_arguments ()
{
- ARGUMENTS="$(getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,exposed-root:,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:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,net-cow-server:,net-tarball:,syslinux-splash:,syslinux-timeout:,syslinux-menu:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,ignore-system-defaults,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}")"
+ ARGUMENTS="$(getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,exposed-root:,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:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,net-cow-server:,net-tarball:,syslinux-splash:,syslinux-timeout:,syslinux-menu:,username,:win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,help,ignore-system-defaults,quiet,usage,verbose,version--name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}")"
if [ "${?}" != "0" ]
then
@@ -589,6 +590,11 @@ Local_arguments ()
shift 2
;;
+ --win32-loader)
+ LH_WIN32_LOADER="${2}"
+ shift 2
+ ;;
+
# config/source
--source)
LH_SOURCE="${2}"
@@ -1044,6 +1050,10 @@ LH_JFFS2_ERASEBLOCK=""
# (Default: ${LH_MEMTEST})
LH_MEMTEST="${LH_MEMTEST}"
+# \$LH_WIN32_LOADER: set win32-loader
+# (Default: ${LH_WIN32_LOADER})
+LH_WIN32_LOADER="${LH_WIN32_LOADER})
+
# \$LH_NET_ROOT_FILESYSTEM: set netboot filesystem
# (Default: ${LH_NET_ROOT_FILESYSTEM})
LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM}"