summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-05-29 14:04:34 +0200
committer Eric Hameleers <alien@slackware.com>2020-05-29 14:04:34 +0200
commit0af67676db33007d9a7319d7f2e1108a5063af82 (patch)
tree0b68077ed0a8c99b2de758288a9e91ab9dfacec0 /make_slackware_live.sh
parent442e7bbb19435181e7f86f28ee89e39d05f1e4fc (diff)
downloadliveslak-0af67676db33007d9a7319d7f2e1108a5063af82.tar.gz
liveslak-0af67676db33007d9a7319d7f2e1108a5063af82.tar.xz
make_slackware_live.sh: fixes for the DAW variant
Diffstat (limited to '')
-rwxr-xr-xmake_slackware_live.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 7e70d50..f1e5cbd 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -180,8 +180,9 @@ SEQ_SLACKWARE="tagfile:a,ap,d,e,f,k,kde,kdei,l,n,t,tcl,x,xap,xfce,y pkglist:slac
SEQ_XFCEBASE="${MINLIST},noxbase,x_base,xapbase,xfcebase"
# Stripped-down Slackware with Plasma5 as the Desktop Environment:
-# - each series will become a squashfs module:
-SEQ_DAW="pkglist:${MINLIST},noxbase,x_base,xapbase,plasma5base,slackextra,slackpkgplus,alien4daw,daw"
+# - each series will become a squashfs module.
+# Note that loading the modules needs a specific order, which we force:
+SEQ_DAW="pkglist:${MINLIST},noxbase,x_base,xapbase,slackextra,slackpkgplus,z00_slk4daw,z01_plasma5base,z02_alien4daw,z03_daw"
# List of Slackware package series with Plasma5 instead of KDE 4 (full install):
# - each will become a squashfs module:
@@ -1923,10 +1924,10 @@ Zonetab=/usr/share/zoneinfo/zone.tab
ZonetabCache=
EOT
-if [ "$LIVEDE" = "PLASMA5" ]; then
+if [ "$LIVEDE" = "PLASMA5" -o "$LIVEDE" = "DAW" ]; then
# -------------------------------------------------------------------------- #
- echo "-- Configuring PLASMA5."
+ echo "-- Configuring PLASMA5/DAW."
# -------------------------------------------------------------------------- #
# Remove the confusing openbox session if present:
@@ -2034,7 +2035,7 @@ text/html=kwebkitpart.desktop;
EOT
fi
-fi # End LIVEDE = PLASMA5
+fi # End LIVEDE = PLASMA5/DAW
if [ "$LIVEDE" = "DLACK" ]; then
@@ -2068,8 +2069,8 @@ if [ "$LIVEDE" = "DAW" ]; then
# Stream ALSA through Pulse and all through Jack. This is achieved by
# having pulseaudio-jack module installed and starting jack-dbus:
- mkdir -p .config/rncbc.org
- cat <<EOT > .config/rncbc.org/QjackCtl.conf
+ mkdir -p ${LIVE_ROOTDIR}/home/${LIVEUID}/.config/rncbc.org
+ cat <<EOT > ${LIVE_ROOTDIR}/home/${LIVEUID}/.config/rncbc.org/QjackCtl.conf
[Options]
DBusEnabled=true
JackDBusEnabled=true