summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-05-27 22:40:52 +0200
committer Eric Hameleers <alien@slackware.com>2016-05-27 22:40:52 +0200
commit017eaba887b33f431e161934a282321f76909d14 (patch)
tree46b03f6e5393a571a19e77cd2bf8dc6bcb0c6f77 /make_slackware_live.sh
parentfbf742e42d344aec6f0add4ae6540d523fd42601 (diff)
downloadliveslak-017eaba887b33f431e161934a282321f76909d14.tar.gz
liveslak-017eaba887b33f431e161934a282321f76909d14.tar.xz
XFCE: take into account that the 32bit ISO does not contain a SMP kernel.
In order to successfully generate a 32bit ISO of the small XFCE variant, the variable SMP32 needs to be set to "NO" because the package for the SMP kernel will not be added (due to size constraints). Example commandline to achieve this: SMP32=NO ./make_slackware_live.sh -d XFCE -a i586
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-xmake_slackware_live.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 2c370c9..30ca041 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1701,7 +1701,11 @@ if [ "$NFSROOTSUP" = "YES" ]; then
etc/dhcpcd.conf.new
mv ${LIVE_ROOTDIR}/boot/initrd-tree/etc/dhcpcd.conf{.new,}
# Add just the right kernel network modules by pruning unneeded stuff:
- KMODS_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "kernel-modules-*$(echo $KGEN |tr - _)*.t?z" |head -1)
+ if [ "$SL_ARCH" = "x86_64" -o "$SMP32" = "NO" ]; then
+ KMODS_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "kernel-modules-*$(echo $KGEN |tr - _)*.t?z" |grep -v smp |head -1)
+ else
+ KMODS_PKG=$(find ${DEF_SL_PKGROOT}/../ -name "kernel-modules-*$(echo $KGEN |tr - _)*.t?z" |grep smp |head -1)
+ fi
KMODS_TEMP=$(mktemp -d -p /mnt -t liveslak.XXXXXX)
if [ ! -d $KMODS_TEMP ]; then
echo "*** Failed to create a temporary extraction directory for the initrd!"