proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-03 15:56:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc-debian: allow not including contrib/non-free

Browse Source 
Signed-off-by: Antonio Terceiro <terceiro@debian.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Antonio Terceiro 2015-08-19 23:06:50 +02:00 committed by Stéphane Graber
parent 6a082d5a13
commit c2a85d043b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/lxc-debian.in
View File

@ -159,13 +159,19 @@ write_sourceslist()
prefix="deb [arch=${arch}]" prefix="deb [arch=${arch}]"
fi fi
if [ "$mainonly" = 1 ]; then
non_main=''
else
non_main=' contrib non-free'
fi
cat >> "${rootfs}/etc/apt/sources.list" << EOF cat >> "${rootfs}/etc/apt/sources.list" << EOF
${prefix} $MIRROR ${release} main contrib non-free ${prefix} $MIRROR ${release} main${non_main}
EOF EOF
if [ "$release" != "unstable" -a "$release" != "sid" ]; then if [ "$release" != "unstable" -a "$release" != "sid" ]; then
cat >> "${rootfs}/etc/apt/sources.list" << EOF cat >> "${rootfs}/etc/apt/sources.list" << EOF
${prefix} $SECURITY_MIRROR ${release}/updates main contrib non-free ${prefix} $SECURITY_MIRROR ${release}/updates main${non_main}
EOF EOF
fi fi
} }
@ -471,6 +477,7 @@ Options :
--packages=PACKAGE_NAME1,PACKAGE_NAME2,... --packages=PACKAGE_NAME1,PACKAGE_NAME2,...
List of additional packages to install. Comma separated, without space. List of additional packages to install. Comma separated, without space.
-c, --clean only clean up the cache and terminate -c, --clean only clean up the cache and terminate
--main-only include only Debian's main repository (i.e. no contrib and non-free).
Environment variables: Environment variables:
@ -483,7 +490,7 @@ EOF
return 0 return 0
} }
options=$(getopt -o hp:n:a:r:c -l arch:,clean,help,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror: -- "$@") options=$(getopt -o hp:n:a:r:c -l arch:,clean,help,main-only,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror: -- "$@")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage $(basename $0) usage $(basename $0)
exit 1 exit 1
@ -512,6 +519,7 @@ do
-a|--arch) arch=$2; shift 2;; -a|--arch) arch=$2; shift 2;;
-c|--clean) clean=1; shift 1;; -c|--clean) clean=1; shift 1;;
--main-only) mainonly=1; shift 1;;
--mirror) MIRROR=$2; shift 2;; --mirror) MIRROR=$2; shift 2;;
-n|--name) name=$2; shift 2;; -n|--name) name=$2; shift 2;;
--packages) packages=$2; shift 2;; --packages) packages=$2; shift 2;;