Merge branch 'dlack'

New supported LIVEDE value: DLACK

This merge adds Dlackware as a DE choice when generating the ISO.
Dlackware is Slackware with PAM, systemd and Gnome3 (and without KDE4).
I think this is an interesting experiment.  Know your enemy ;-)
Thanks to bartgymnast of the Dlackware team who provided the patches.

6 files changed, 308 insertions, 3 deletions

diff --git a/liveinit.tpl b/liveinit.tpl
index 3b035c0..de23e24 100755
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -814,6 +814,7 @@ if [ -x /usr/bin/loadkeys ]; then
 fi
 EOT
     chmod 755 /mnt/overlay/etc/rc.d/rc.keymap
+    echo "KEYMAP=${KEYMAP}" > /mnt/overlay/etc/vconsole.conf
   fi
   if [ ! -z "$KEYMAP" -o ! -z "$XKB" ]; then
     # Set a keyboard mapping in X.Org, derived from the console map if needed:
@@ -890,6 +891,7 @@ EOT
     # Configure custom locale:
     echo "${MARKER}:  Switching to '$LOCALE' locale"
     sed -i -e "s/^ *export LANG=.*/export LANG=${LOCALE}/" /mnt/overlay/etc/profile.d/lang.sh
+    echo "LANG=${LOCALE}" > /mnt/overlay/etc/locale.conf
   fi
 
   if [ ! -z "$TZ" -a -f /mnt/overlay/usr/share/zoneinfo/${TZ} ]; then
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 746bbbc..a5b4cfb 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -94,7 +94,7 @@ DISTRO=${DISTRO:-"slackware"}
 LIVE_HOSTNAME=${LIVE_HOSTNAME:-"darkstar"}
 
 # What type of Live image?
-# Choices are: SLACKWARE, XFCE, KDE4, PLASMA5, MATE, CINNAMON
+# Choices are: SLACKWARE, XFCE, KDE4, PLASMA5, MATE, CINNAMON, DLACK
 LIVEDE=${LIVEDE:-"SLACKWARE"}
 
 # What runlevel to use if adding a DE like: XFCE, KDE4, PLASMA5 etc...
@@ -182,6 +182,10 @@ SEQ_MSB="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,mate loc
 # - each will become a squashfs module:
 SEQ_CIN="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,cinnamon local:slackpkg+"
 
+# Slackware package series with Gnome3/systemd instead of KDE4 (full install):
+# - each will become a squashfs module:
+SEQ_DLACK="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap pkglist:slackextra,systemd,dlackware"
+
 # List of kernel modules required for a live medium to boot properly;
 # Lots of HID modules added to support keyboard input for LUKS password entry:
 KMODS=${KMODS:-"squashfs:overlay:loop:xhci-pci:ohci-pci:ehci-pci:xhci-hcd:uhci-hcd:ehci-hcd:usb-storage:hid:usbhid:i2c-hid:hid-generic:hid-cherry:hid-logitech:hid-logitech-dj:hid-logitech-hidpp:hid-lenovo:hid-microsoft:hid_multitouch:jbd:mbcache:ext3:ext4:isofs:fat:nls_cp437:nls_iso8859-1:msdos:vfat:ntfs"}
@@ -758,8 +762,8 @@ do
         echo " -h                 This help."
         echo " -a arch            Machine architecture (default: ${SL_ARCH})."
         echo "                    Use i586 for a 32bit ISO, x86_64 for 64bit."
-        echo " -d desktoptype     SLACKWARE (full Slack), KDE4 (basic KDE4),"
-        echo "                    XFCE (basic XFCE), PLASMA5, MATE, CINNAMON."
+        echo " -d desktoptype     SLACKWARE (full Slack), KDE4 basic,"
+        echo "                    XFCE basic, PLASMA5, MATE, CINNAMON, DLACK."
         echo " -e                 Use ISO boot-load-size of 32 for computers."
         echo "                    where the ISO won't boot otherwise."
         echo " -f                 Forced re-generation of all squashfs modules,"
@@ -960,6 +964,7 @@ case "$LIVEDE" in
     PLASMA5) MSEQ="${SEQ_PLASMA5}" ;;
        MATE) MSEQ="${SEQ_MSB}" ;;
    CINNAMON) MSEQ="${SEQ_CIN}" ;;
+      DLACK) MSEQ="${SEQ_DLACK}" ;;
           *) if [ -n "${SEQ_CUSTOM}" ]; then
                # Custom distribution with a predefined package list:
                MSEQ="${SEQ_CUSTOM}"              
@@ -1124,6 +1129,9 @@ if grep -q "^ *export LANG=" ${LIVE_ROOTDIR}/etc/profile.d/lang.sh ; then
 else
   echo "export LANG=en_US.UTF-8" >> ${LIVE_ROOTDIR}/etc/profile.d/lang.sh
 fi
+# Does not hurt to also add systemd compatible configuration:
+echo "LANG=en_US.UTF-8" > ${LIVE_ROOTDIR}/etc/locale.conf
+echo "KEYMAP=us" > ${LIVE_ROOTDIR}/etc/vconsole.conf
 
 # Set timezone to UTC:
 cp -a ${LIVE_ROOTDIR}/usr/share/zoneinfo/UTC ${LIVE_ROOTDIR}/etc/localtime
@@ -1620,6 +1628,29 @@ EOGL
 
 fi # End LIVEDE = PLASMA5
 
+if [ "$LIVEDE" = "DLACK" ]; then
+
+  # -------------------------------------------------------------------------- #
+  echo "-- Configuring DLACK."
+  # -------------------------------------------------------------------------- #
+
+  # Make sure we start in graphical mode with gdm enabled.
+  ln -sf /lib/systemd/system/graphical.target ${LIVE_ROOTDIR}/etc/systemd/system/default.target
+  ln -sf /lib/systemd/system/gdm.service ${LIVE_ROOTDIR}/etc/systemd/system/display-manager.service
+
+  # Do not show the blueman applet, Gnome3 has its own BlueTooth widget:
+  echo "NotShowIn=GNOME;" >> ${LIVE_ROOTDIR}/etc/xdg/autostart/blueman.desktop
+
+  # Do not start gnome-initial-setup:
+  mkdir -p ${LIVE_ROOTDIR}/home/${LIVEUID}/.config
+  touch ${LIVE_ROOTDIR}/home/${LIVEUID}/.config/gnome-initial-setup-done
+
+  # Do not let systemd re-generate dynamic linker cache on boot:
+  echo "File created by ${MARKER}.  See systemd-update-done.service(8)." \
+    |tee ${LIVE_ROOTDIR}/etc/.updated >${LIVE_ROOTDIR}/var/.updated
+
+fi # End LIVEDE = DLACK  
+
 # You can define the function 'custom_config()' by uncommenting it in
 # the configuration file 'make_slackware_live.conf'.
 if type custom_config 1>/dev/null 2>/dev/null ; then
@@ -1662,6 +1693,8 @@ elif [ "$LIVEDE" = "MATE" ]; then
   ln -sf xinitrc.mate-session ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
 elif [ "$LIVEDE" = "CINNAMON" ]; then
   ln -sf xinitrc.cinnamon-session ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
+elif [ "$LIVEDE" = "DLACK" ]; then
+  ln -sf xinitrc.gnome ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
 elif [ -f ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc.xfce ]; then
   ln -sf xinitrc.xfce ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
 fi
diff --git a/pkglists/dlackware.conf b/pkglists/dlackware.conf
new file mode 100644
index 0000000..647aac3
--- /dev/null
+++ b/pkglists/dlackware.conf
@@ -0,0 +1,15 @@
+# If 'SL_REPO_URL' is a rsync:// URL and 'SL_REPO' points to a non-existent
+# or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
+# to the local directory 'SL_REPO'.
+
+VARIANT=3.22
+
+SL_REPO_URL="rsync://pkgs.dlackware.com/mirrors/slackware/dlack/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/dlackware/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
+
+# Package root directory:
+SL_PKGROOT=${SL_REPO}
+
+# Patches root directory:
+SL_PATCHROOT=""
+
diff --git a/pkglists/dlackware.lst b/pkglists/dlackware.lst
new file mode 100644
index 0000000..8591361
--- /dev/null
+++ b/pkglists/dlackware.lst
@@ -0,0 +1,221 @@
+#
+# Packages to be rebuilt/added as base for the gnome build:
+#
+NetworkManager
+#appdata-tools
+appstream-glib
+avahi
+gcab
+glib-networking
+glib2
+gnome-keyring
+gst-libav
+gst-plugins-bad
+gst-plugins-base
+gst-plugins-good
+gst-plugins-ugly
+gstreamer
+gtk+3
+gucharmap
+gvfs
+json-glib
+libbluray
+libcap
+libdaemon
+libinput
+libwacom
+libwebp
+mesa
+polkit
+shared-mime-info
+systemd-service-files
+udisks2
+upower
+wayland
+wayland-protocols
+wpa_supplicant
+xorg-server
+xorg-server-xwayland
+
+### [gnome-suites-core-deps] begin
+GeoIP
+PackageKit
+accountsservice
+aisleriot
+atk
+atkmm
+autoconf-archive
+baobab
+brasero
+cantarell-fonts
+caribou
+check
+cheese
+clutter
+clutter-gst
+clutter-gtk
+cogl
+colord
+colord-gtk
+dbus-python3
+dconf
+dconf-editor
+devhelp
+dlack-settings
+dlackware
+eog
+epiphany
+evince
+evolution
+evolution-data-server
+exempi
+farstream
+file-roller
+folks
+gdk-pixbuf2
+# ibus needs to be installed before gdm:
+ibus
+gdm
+gedit
+gegl3
+geoclue
+geocode-glib
+gexiv2
+gfbgraph
+gitg
+gjs
+glade
+glibmm
+gnome-applets
+gnome-autoar
+gnome-backgrounds
+gnome-bluetooth
+gnome-builder
+gnome-calculator
+gnome-clocks
+gnome-color-manager
+gnome-common
+gnome-contacts
+gnome-control-center
+gnome-desktop
+gnome-devel-docs
+gnome-dictionary
+gnome-disk-utility
+gnome-documents
+gnome-font-viewer
+gnome-getting-started-docs
+gnome-initial-setup
+gnome-js-common
+gnome-logs
+gnome-mahjongg
+gnome-menus
+gnome-music
+gnome-nettool
+gnome-online-accounts
+gnome-online-miners
+gnome-packagekit
+gnome-panel
+gnome-photos
+gnome-power-manager
+gnome-screenshot
+gnome-session
+gnome-settings-daemon
+gnome-shell
+gnome-shell-extensions
+gnome-system-log
+gnome-system-monitor
+gnome-terminal
+gnome-todo
+gnome-tweak-tool
+gnome-user-docs
+gnome-user-share
+gnome-video-effects
+gnome-weather
+gobject-introspection
+grilo
+grilo-plugins
+gsettings-desktop-schemas
+gsound
+gspell
+gssdp
+gtk-engines
+gtk-vnc
+gtkhtml
+gtksourceview
+gtksourceviewmm
+gtkspell3
+gupnp
+gupnp-av
+gupnp-dlna
+gupnp-igd
+hyphen
+libchamplain
+libcryptui
+libdmapsharing
+libdvdcss
+libgdata
+libgee
+libgepub
+libgit2
+libgit2-glib
+libgnomekbd
+libgsystem
+libgtop
+libgusb
+libgweather
+libgxps
+libmediaart
+libmusicbrainz5
+libnice
+liboauth
+libosinfo
+libpeas
+libquvi
+libquvi-scripts
+libsigc++
+libwnck3
+libxml++
+libzapojit
+lua
+mm-common
+mousetweaks
+mozjs24
+mutter
+nautilus
+nautilus-sendto
+nemiver
+orca
+pcre2
+plymouth
+py3atspi
+py3cairo
+py3gobject3
+pyatspi
+pylint
+python-requests
+quvi
+rdflib
+rest
+rygel
+seahorse
+seed
+sushi
+telepathy-glib
+telepathy-logger
+telepathy-mission-control
+totem
+totem-pl-parser
+tracker
+uhttpmock
+vala
+vinagre
+vino
+vte2_91
+webkitgtk
+webkitgtk1
+yelp
+yelp-tools
+yelp-xsl
+zeitgeist
+zenity
+
diff --git a/pkglists/systemd.conf b/pkglists/systemd.conf
new file mode 100644
index 0000000..647aac3
--- /dev/null
+++ b/pkglists/systemd.conf
@@ -0,0 +1,15 @@
+# If 'SL_REPO_URL' is a rsync:// URL and 'SL_REPO' points to a non-existent
+# or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
+# to the local directory 'SL_REPO'.
+
+VARIANT=3.22
+
+SL_REPO_URL="rsync://pkgs.dlackware.com/mirrors/slackware/dlack/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/dlackware/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
+
+# Package root directory:
+SL_PKGROOT=${SL_REPO}
+
+# Patches root directory:
+SL_PATCHROOT=""
+
diff --git a/pkglists/systemd.lst b/pkglists/systemd.lst
new file mode 100644
index 0000000..ca8855b
--- /dev/null
+++ b/pkglists/systemd.lst
@@ -0,0 +1,19 @@
+# The installation order in this list is important. Do not try to change it.
+#
+# pam:
+krb5
+cracklib
+pam
+libpwquality
+shadow
+pam_krb5
+
+# systemd:
+python3
+lxml
+libxkbcommon
+eudev%systemd
+dbus
+util-linux
+openssh
+procps-ng