summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-01-10 14:08:42 +0100
committer Eric Hameleers <alien@slackware.com>2016-01-10 14:08:42 +0100
commit285180c18a5348b7f025502fb6e42c289aeb9fb1 (patch)
treefc228d0f54ce3f0be4f8cf289983dba1d2353353 /make_slackware_live.sh
parent6ed9f699acbe1278753d6d7267db903c4b452a35 (diff)
downloadliveslak-285180c18a5348b7f025502fb6e42c289aeb9fb1.tar.gz
liveslak-285180c18a5348b7f025502fb6e42c289aeb9fb1.tar.xz
Do not add Nvidia proprietary drivers to the Full Slackware ISO.
The customized ISOs (Slackware plus 3rd party software) can include the proprietary drivers, but the Full Slackware ISO is meant as a demo for official Slackware and therefore should not include 3rd party packages. If you respin the SLACKWARE ISO, it is of course still possible to add the binary Nvidia blob yourself by copying the graphics/*nvidia*.szx file to the 'optional' directory yourself. Nothing else is needed, it will 'just' work.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-xmake_slackware_live.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index bcf8011..e317abd 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1406,10 +1406,16 @@ if [ -f ${LIVE_TOOLDIR}/optional/*.sxz ]; then
cp ${LIVE_TOOLDIR}/optional/*.sxz ${LIVE_MOD_OPT}/
fi
-if [ "$LIVEDE" != "XFCE" -a -f ${LIVE_TOOLDIR}/graphics/*.sxz ]; then
- # KDE/PLASMA etc will profit; add custom (proprietary) graphics drivers:
- echo "-- Adding binary GPU drivers."
- cp ${LIVE_TOOLDIR}/graphics/*.sxz ${LIVE_MOD_OPT}/
+if [ "$LIVEDE" != "XFCE" -a "$LIVEDE" != "SLACKWARE" ]; then
+ # KDE/PLASMA etc will profit from accelerated graphics support;
+ # however the SLACKWARE ISO should not have any non-Slackware content.
+ # You can 'cheat' when building the SLACKWARE ISO by copying the graphics
+ # drivers into the 'optional' directory yourself.
+ if [ -f ${LIVE_TOOLDIR}/graphics/*.sxz ]; then
+ # Add custom (proprietary) graphics drivers:
+ echo "-- Adding binary GPU drivers."
+ cp ${LIVE_TOOLDIR}/graphics/*.sxz ${LIVE_MOD_OPT}/
+ fi
fi
# Directory for rootcopy files (everything placed here will be copied