QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: renamed key files to match same format as those in qubes-builder

Browse Source
This commit is contained in:
Jason Mehring 2014-11-10 10:46:24 -05:00
parent 2838225f44
commit 26a594a8e5
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts_debian/01_install_core.sh
View File

@ -26,7 +26,7 @@ buildStep "$0" "pre"
if ! [ -f "${INSTALLDIR}/tmp/.prepared_debootstrap" ]; then if ! [ -f "${INSTALLDIR}/tmp/.prepared_debootstrap" ]; then
debug "Installing base ${DEBIANVERSION} system" debug "Installing base ${DEBIANVERSION} system"
COMPONENTS="" debootstrap --arch=amd64 --include=ncurses-term \ COMPONENTS="" debootstrap --arch=amd64 --include=ncurses-term \
--components=main --keyring="${SCRIPTSDIR}/keys/debian-${DEBIANVERSION}-archive-keyring.gpg" \ --components=main --keyring="${SCRIPTSDIR}/keys/${DEBIANVERSION}-debian-archive-keyring.gpg" \
"${DEBIANVERSION}" "${INSTALLDIR}" "${DEBIAN_MIRROR}" || { error "Debootstrap failed!"; exit 1; } "${DEBIANVERSION}" "${INSTALLDIR}" "${DEBIAN_MIRROR}" || { error "Debootstrap failed!"; exit 1; }
chroot "${INSTALLDIR}" chmod 0666 "/dev/null" chroot "${INSTALLDIR}" chmod 0666 "/dev/null"
touch "${INSTALLDIR}/tmp/.prepared_debootstrap" touch "${INSTALLDIR}/tmp/.prepared_debootstrap"

BIN
scripts_debian/keys/jessie-debian-archive-keyring.gpg Normal file
View File

Binary file not shown.

BIN
scripts_debian/keys/wheezy-debian-archive-keyring.gpg Normal file
View File

Binary file not shown.

4
scripts_debian/vars.sh
View File

@ -11,8 +11,8 @@
DEBIANVERSION=${DIST} DEBIANVERSION=${DIST}
# Location to grab debian packages # Location to grab debian packages
DEBIAN_MIRROR=http://ftp.us.debian.org/debian/ DEBIAN_MIRROR=http://ftp.us.debian.org/debian
#DEBIAN_MIRROR=http://http.debian.net/debian #DEBIAN_MIRROR=http://http.debian.net/debian
#DEBIAN_MIRROR=http://ftp.ca.debian.org/debian/ #DEBIAN_MIRROR=http://ftp.ca.debian.org/debian
APT_GET_OPTIONS="-o Dpkg::Options::="--force-confnew" --force-yes -y" APT_GET_OPTIONS="-o Dpkg::Options::="--force-confnew" --force-yes -y"