From 8e823f7368d592a1ee0004c9c2ee4dd70ce44dda Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 14:46:13 +0200 Subject: Automatically adding restricted archive areas for progress-linux extras repositories if non-free is enabled. Signed-off-by: Daniel Baumann --- share/scripts/debconf | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/share/scripts/debconf b/share/scripts/debconf index 155c022..f463123 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -547,11 +547,21 @@ Configure_system () ;; ${DIST}-extras) - echo "deb ${MIRROR} ${DIST}-extras ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + if echo "${AREA}" | grep -qs non-free + then + echo "deb ${MIRROR} ${DIST}-extras ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + else + echo "deb ${MIRROR} ${DIST}-extras ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + fi ;; ${DIST}-extras-staging) - echo "deb ${MIRROR} ${DIST}-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + if echo "${AREA}" | grep -qs non-free + then + echo "deb ${MIRROR} ${DIST}-extras-staging ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + else + echo "deb ${MIRROR} ${DIST}-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + fi ;; ${DIST}-backports) @@ -563,11 +573,21 @@ Configure_system () ;; ${DIST}-backports-extras) - echo "deb ${MIRROR} ${DIST}-backports-extras ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + if echo "${AREA}" | grep -qs non-free + then + echo "deb ${MIRROR} ${DIST}-backports-extras ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + else + echo "deb ${MIRROR} ${DIST}-backports-extras ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + fi ;; ${DIST}-backports-extras-staging) - echo "deb ${MIRROR} ${DIST}-backports-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + if echo "${AREA}" | grep -qs non-free + then + echo "deb ${MIRROR} ${DIST}-backports-extras-staging ${AREA} restricted" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + else + echo "deb ${MIRROR} ${DIST}-backports-extras-staging ${AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/progress-linux.list" + fi ;; esac done -- cgit v1.2.3