Merge remote-tracking branch 'RPi-Distro/dev' into dev

# Conflicts:
#	README.md
#	stage3/00-install-packages/00-packages
This commit is contained in:
Yossi
2017-06-07 13:44:00 +03:00
parent 047334dea0
commit 4df2c00cee
4 changed files with 145 additions and 3 deletions
+2 -2
View File
@@ -16,8 +16,8 @@ bootstrap(){
fi
capsh --drop=cap_setfcap -- -c "${BOOTSTRAP_CMD} --components=main,contrib,non-free \
--arch armhf\
--no-check-gpg \
--arch armhf \
--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
$1 $2 $3"
}
export -f bootstrap