summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--liveinit.tpl10
-rwxr-xr-xmake_slackware_live.sh80
-rw-r--r--pkglists/mate.lst1
-rw-r--r--pkglists/min.lst1
-rw-r--r--pkglists/noxbase.lst1
-rw-r--r--pkglists/plasma5.lst22
-rw-r--r--pkglists/x_base.lst1
-rw-r--r--upslak.sh42
8 files changed, 85 insertions, 73 deletions
diff --git a/liveinit.tpl b/liveinit.tpl
index 6fd9620..3ac0782 100644
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -292,7 +292,7 @@ if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then
if [ -n "$NFSHOST" ]; then
# We also need network devices if NFS root is requested:
if [ -z "$(/sbin/udevadm trigger --subsystem-match=net --action=add -v -n |rev |cut -d/ -f1 |rev |grep -v lo)" ]; then
- /sbin/udevadm trigger $DEBUGV
+ /sbin/udevadm trigger --action=add $DEBUGV
else
/sbin/udevadm trigger --subsystem-match=net --action=add $DEBUGV
fi
@@ -308,14 +308,6 @@ if [ ! -d /lib/modules/$(uname -r) ]; then
elif [ -x ./load_kernel_modules ]; then # use load_kernel_modules script:
echo "${MARKER}: Loading kernel modules from initrd image:"
. ./load_kernel_modules 1>/dev/null 2>/dev/null
-else # load modules (if any) in order:
- if ls /lib/modules/$(uname -r)/*.*o 1> /dev/null 2> /dev/null ; then
- echo "${MARKER}: Loading kernel modules from initrd image:"
- for module in /lib/modules/$(uname -r)/*.*o ; do
- /sbin/modprobe $module 1>/dev/null 2>/dev/null
- done
- unset module
- fi
fi
# Sometimes the devices need extra time to be available.
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 4bd0559..ce0e7dd 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -35,7 +35,7 @@
# -----------------------------------------------------------------------------
# Version of the Live OS generator:
-VERSION="1.3.2.3"
+VERSION="1.3.3"
# Directory where our live tools are stored:
LIVE_TOOLDIR=${LIVE_TOOLDIR:-"$(cd $(dirname $0); pwd)"}
@@ -200,7 +200,7 @@ SEQ_STUDW="tagfile:a,ap,d,e,f,k,kde,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,sl
KMODS=${KMODS:-"squashfs:overlay:loop:xhci-pci:ohci-pci:ehci-pci:xhci-hcd:uhci-hcd:ehci-hcd:mmc-core:mmc-block:sdhci:sdhci-pci:sdhci-acpi:usb-storage:hid:usbhid:i2c-hid:hid-generic:hid-apple: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"}
# Network kernel modules to include for NFS root support:
-NETMODS="kernel/drivers/net"
+NETMODS="kernel/drivers/net kernel/drivers/virtio"
# Network kernel modules to exclude from above list:
NETEXCL="appletalk arcnet bonding can dummy.ko hamradio hippi ifb.ko irda macvlan.ko macvtap.ko pcmcia sb1000.ko team tokenring tun.ko usb veth.ko wan wimax wireless xen-netback.ko"
@@ -320,18 +320,22 @@ uncompressfs () {
#
full_pkgname() {
PACK=$1
- TOPDIR=$2
- # Perhaps I will use this more readable code in future:
- #for FL in $(find ${TOPDIR} -name "${PACK}-*.t?z" 2>/dev/null) ; do
- # # Weed out package names starting with "$PACK"; we want exactly "$PACK":
- # if [ "$(echo $FL |rev |cut -d- -f4- |cut -d/ -f1 |rev)" != "$PACK" ]; then
- # continue
- # else
- # break
- # fi
- #done
- #echo "$FL"
- echo "$(find ${TOPDIR} -name "${PACK}-*.t?z" 2>/dev/null |grep -E "\<${PACK//+/\\+}-[^-]+-[^-]+-[^-]+.t?z" |head -1)"
+ if [ -e $2 ]; then
+ TOPDIR=$2
+ # Perhaps I will use this more readable code in future:
+ #for FL in $(find ${TOPDIR} -name "${PACK}-*.t?z" 2>/dev/null) ; do
+ # # Weed out package names starting with "$PACK"; we want exactly "$PACK":
+ # if [ "$(echo $FL |rev|cut -d- -f4-|cut -d/ -f1|rev)" != "$PACK" ]; then
+ # continue
+ # else
+ # break
+ # fi
+ #done
+ #echo "$FL"
+ echo "$(find ${TOPDIR}/ -name "${PACK}-*.t?z" 2>/dev/null |grep -E "\<${PACK//+/\\+}-[^-]+-[^-]+-[^-]+.t?z" |head -1)"
+ else
+ echo ""
+ fi
}
#
@@ -385,7 +389,7 @@ function install_pkgs() {
else
SELECTION=""
fi
- if [ ! -d ${SL_REPO} -o -z "$(find ${SL_PKGROOT} -type f 2>/dev/null)" ]; then
+ if [ ! -d ${SL_REPO} -o -z "$(find ${SL_PKGROOT}/ -type f 2>/dev/null)" ]; then
# Oops... empty local repository. Let's see if we can rsync from remote:
echo "** Slackware package repository root '${SL_REPO}' does not exist or is empty!"
RRES=1
@@ -639,6 +643,8 @@ EOL
cat ${LIVE_TOOLDIR}/menu.tpl | sed \
-e "s/@KBD@/$KBD/g" \
-e "s/@LANG@/$LANCOD/g" \
+ -e "s/@ULANG@/${DEF_LANG^^}/g" \
+ -e "s,@LOCALE@,${DEF_LOCALE},g" \
-e "s/@CONSFONT@/$CONSFONT/g" \
-e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \
-e "s/@DISTRO@/$DISTRO/g" \
@@ -1879,6 +1885,10 @@ if [ "$LIVEDE" = "PLASMA5" ]; then
then
rm -f ${LIVE_ROOTDIR}/usr/share/wayland-sessions/plasmawayland.desktop || true
fi
+
+ # Set the OS name to "Slackware Live" in "System Information":
+ echo "Name=${DISTRO^} Live" >> ${LIVE_ROOTDIR}/etc/kde/xdg/kcm-about-distrorc
+
# Set sane SDDM defaults on first boot (root-owned file):
mkdir -p ${LIVE_ROOTDIR}/var/lib/sddm
cat <<EOT > ${LIVE_ROOTDIR}/var/lib/sddm/state.conf
@@ -2417,25 +2427,27 @@ if [ "$NFSROOTSUP" = "YES" ]; then
# We need to extract the full kernel-modules package for deps resolving:
tar -C ${KMODS_TEMP} -xf ${KMODS_PKG}
# Get the kernel modules:
- cd ${KMODS_TEMP}
- cp -a --parents lib/modules/${KVER}/${NETMODS} \
- ${LIVE_ROOTDIR}/boot/initrd-tree/
- cd - 1>/dev/null
- # Prune the ones we do not need:
- for KNETRM in ${NETEXCL} ; do
- find ${LIVE_ROOTDIR}/boot/initrd-tree/lib/modules/${KVER}/${NETMODS} \
- -name $KNETRM -depth -exec rm -rf {} \;
- done
- # Add any dependency modules:
- for MODULE in $(find ${LIVE_ROOTDIR}/boot/initrd-tree/lib/modules/${KVER}/${NETMODS} -type f -exec basename {} .ko \;) ; do
- /sbin/modprobe --dirname ${KMODS_TEMP} --set-version $KVER --show-depends --ignore-install $MODULE 2>/dev/null |grep "^insmod " |cut -f 2 -d ' ' |while read SRCMOD; do
- if [ "$(basename $SRCMOD .ko)" != "$MODULE" ]; then
- cd ${KMODS_TEMP}
- # Need to strip ${KMODS_TEMP} from the start of ${SRCMOD}:
- cp -a --parents $(echo $SRCMOD |sed 's|'${KMODS_TEMP}'/|./|' ) \
- ${LIVE_ROOTDIR}/boot/initrd-tree/
- cd - 1>/dev/null
- fi
+ for NETMODPATH in ${NETMODS} ; do
+ cd ${KMODS_TEMP}
+ cp -a --parents lib/modules/${KVER}/${NETMODPATH} \
+ ${LIVE_ROOTDIR}/boot/initrd-tree/
+ cd - 1>/dev/null
+ # Prune the ones we do not need:
+ for KNETRM in ${NETEXCL} ; do
+ find ${LIVE_ROOTDIR}/boot/initrd-tree/lib/modules/${KVER}/${NETMODPATH} \
+ -name $KNETRM -depth -exec rm -rf {} \;
+ done
+ # Add any dependency modules:
+ for MODULE in $(find ${LIVE_ROOTDIR}/boot/initrd-tree/lib/modules/${KVER}/${NETMODPATH} -type f -exec basename {} .ko \;) ; do
+ /sbin/modprobe --dirname ${KMODS_TEMP} --set-version $KVER --show-depends --ignore-install $MODULE 2>/dev/null |grep "^insmod " |cut -f 2 -d ' ' |while read SRCMOD; do
+ if [ "$(basename $SRCMOD .ko)" != "$MODULE" ]; then
+ cd ${KMODS_TEMP}
+ # Need to strip ${KMODS_TEMP} from the start of ${SRCMOD}:
+ cp -a --parents $(echo $SRCMOD |sed 's|'${KMODS_TEMP}'/|./|' ) \
+ ${LIVE_ROOTDIR}/boot/initrd-tree/
+ cd - 1>/dev/null
+ fi
+ done
done
done
# Remove the temporary tree:
diff --git a/pkglists/mate.lst b/pkglists/mate.lst
index 6424c37..e534504 100644
--- a/pkglists/mate.lst
+++ b/pkglists/mate.lst
@@ -53,6 +53,7 @@ mate-themes
# MSB EXTRA:
atril
+caja-actions
caja-dropbox
caja-extensions
galculator
diff --git a/pkglists/min.lst b/pkglists/min.lst
index e7d51e6..da65091 100644
--- a/pkglists/min.lst
+++ b/pkglists/min.lst
@@ -32,6 +32,7 @@ eudev
file
findutils
floppy
+fuse3
gawk
gc
#ghostscript
diff --git a/pkglists/noxbase.lst b/pkglists/noxbase.lst
index d6ec902..f6ac616 100644
--- a/pkglists/noxbase.lst
+++ b/pkglists/noxbase.lst
@@ -32,6 +32,7 @@ ilmbase
intltool
ipw2100-fw
ipw2200-fw
+isl
iw
js185
lcms2
diff --git a/pkglists/plasma5.lst b/pkglists/plasma5.lst
index f4bafaf..1cf9613 100644
--- a/pkglists/plasma5.lst
+++ b/pkglists/plasma5.lst
@@ -3,6 +3,7 @@
#
# deps:
ConsoleKit2
+LibRaw
OpenAL
PyQt
PyQt5
@@ -20,6 +21,7 @@ drumstick
dvdauthor
elogind
espeak-ng
+exiv2
flite
freecell-solver
frei0r-plugins
@@ -65,7 +67,6 @@ qca-qt5
qrencode
qt-gstreamer
qt5
-qt5-speech
qt5-webkit
qtav
rttr
@@ -148,11 +149,13 @@ kapidox
karchive
kauth
kbookmarks
+kcalendarcore
kcmutils
kcodecs
kcompletion
kconfig
kconfigwidgets
+kcontacts
kcoreaddons
kcrash
kdbusaddons
@@ -236,9 +239,7 @@ kaddressbook
kalarm
kalarmcal
kblog
-kcalcore
kcalutils
-kcontacts
kdav
kdepim-addons
kdepim-apps-libs
@@ -295,6 +296,7 @@ kscreen2
kscreenlocker
ksshaskpass
ksysguard
+kwallet-pam
kwayland
kwayland-integration
kwin
@@ -448,7 +450,7 @@ ksystemlog
kteatime
ktimer
ktouch
-ktuberling
+#ktuberling
kturtle
kubrick
kwalletmanager
@@ -495,11 +497,11 @@ digikam
falkon
kaudiocreator
krita
-kdev-php
-kdev-python
-kdevelop
-kdevelop-pg-qt
-kdevplatform
+#kdev-php
+#kdev-python
+#kdevelop
+#kdevelop-pg-qt
+#kdevplatform
kdiagram
kile
kjots
@@ -508,7 +510,7 @@ kpmcore
krename
krusader
kstars
-ktorrent
+#ktorrent
kuser
kwebkitpart
libktorrent
diff --git a/pkglists/x_base.lst b/pkglists/x_base.lst
index 690326d..83bf1ee 100644
--- a/pkglists/x_base.lst
+++ b/pkglists/x_base.lst
@@ -71,6 +71,7 @@ glproto
glu
gmime
gnome-keyring
+gnome-themes-extra
gnome-themes-standard
gobject-introspection
graphite2
diff --git a/upslak.sh b/upslak.sh
index 92f549b..c1559df 100644
--- a/upslak.sh
+++ b/upslak.sh
@@ -134,7 +134,7 @@ COMPR="xz --check=crc32"
KMODS=${KMODS:-"squashfs:overlay:loop:xhci-pci:ohci-pci:ehci-pci:xhci-hcd:uhci-hcd:ehci-hcd:mmc-core:mmc-block:sdhci:sdhci-pci:sdhci-acpi:usb-storage:hid:usbhid:i2c-hid:hid-generic:hid-apple: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"}
# Network kernel modules to include for NFS root support:
-NETMODS="kernel/drivers/net"
+NETMODS="kernel/drivers/net kernel/drivers/virtio"
# Network kernel modules to exclude from above list:
NETEXCL="appletalk arcnet bonding can dummy.ko hamradio hippi ifb.ko irda macvlan.ko macvtap.ko pcmcia sb1000.ko team tokenring tun.ko usb veth.ko wan wimax wireless xen-netback.ko"
@@ -329,25 +329,27 @@ collect_kmods() {
# Do we have to add network support?
if [ $NETSUPPORT -eq 1 ]; then
# The initrd already contains dhcpcd so we just need to add kmods:
- cd ${KMODDIR}
- mkdir -p ${IMGDIR}/lib/modules/${KVER}
- cp -a --parents ${NETMODS} ${IMGDIR}/lib/modules/${KVER}/
- cd - 1>/dev/null
- # Prune the ones we do not need:
- for KNETRM in ${NETEXCL} ; do
- find ${IMGDIR}/lib/modules/${KVER}/${NETMODS} \
- -name $KNETRM -depth -exec rm -rf {} \;
- done
- # Add any dependency modules:
- for MODULE in $(find ${IMGDIR}/lib/modules/${KVER}/${NETMODS} -type f -exec basename {} .ko \;) ; do
- modprobe --dirname ${KMODDIR%%/lib/modules/${KVER}} --set-version $KVER --show-depends --ignore-install $MODULE 2>/dev/null |grep "^insmod " |cut -f 2 -d ' ' |while read SRCMOD; do
- if [ "$(basename $SRCMOD .ko)" != "$MODULE" ]; then
- cd ${KMODDIR}
- # Need to strip ${KMODDIR} from the start of ${SRCMOD}:
- cp -a --parents $(echo $SRCMOD |sed 's|'${KMODDIR}'/|./|' ) \
- ${IMGDIR}/lib/modules/${KVER}/
- cd - 1>/dev/null
- fi
+ for NETMODPATH in ${NETMODS} ; do
+ cd ${KMODDIR}
+ mkdir -p ${IMGDIR}/lib/modules/${KVER}
+ cp -a --parents ${NETMODPATH} ${IMGDIR}/lib/modules/${KVER}/
+ cd - 1>/dev/null
+ # Prune the ones we do not need:
+ for KNETRM in ${NETEXCL} ; do
+ find ${IMGDIR}/lib/modules/${KVER}/${NETMODPATH} \
+ -name $KNETRM -depth -exec rm -rf {} \;
+ done
+ # Add any dependency modules:
+ for MODULE in $(find ${IMGDIR}/lib/modules/${KVER}/${NETMODPATH} -type f -exec basename {} .ko \;) ; do
+ modprobe --dirname ${KMODDIR%%/lib/modules/${KVER}} --set-version $KVER --show-depends --ignore-install $MODULE 2>/dev/null |grep "^insmod " |cut -f 2 -d ' ' |while read SRCMOD; do
+ if [ "$(basename $SRCMOD .ko)" != "$MODULE" ]; then
+ cd ${KMODDIR}
+ # Need to strip ${KMODDIR} from the start of ${SRCMOD}:
+ cp -a --parents $(echo $SRCMOD |sed 's|'${KMODDIR}'/|./|' ) \
+ ${IMGDIR}/lib/modules/${KVER}/
+ cd - 1>/dev/null
+ fi
+ done
done
done
fi