3 files changed, 6 insertions, 29 deletions
diff --git a/usb-and-pxe-installers/README_USB.TXT b/usb-and-pxe-installers/README_USB.TXT
index a8079feee..12bc25257 100644
--- a/usb-and-pxe-installers/README_USB.TXT
+++ b/usb-and-pxe-installers/README_USB.TXT
@@ -72,7 +72,7 @@ copy the 'usbboot.img' file to a USB stick as follows:
     example command line below, I am assuming that the USB stick is known as
     '/dev/sdx'.
 
-      dd if=usbboot.img of=/dev/sdx bs=512
+      dd if=usbboot.img of=/dev/sdx bs=1M
 
     Be careful about the device name for your USB stick!  The above 'dd' 
     command will wipe out any existing data on the device, so you had better 
diff --git a/usb-and-pxe-installers/pxelinux.cfg_default b/usb-and-pxe-installers/pxelinux.cfg_default
index 4842df82d..e727685d6 100644
--- a/usb-and-pxe-installers/pxelinux.cfg_default
+++ b/usb-and-pxe-installers/pxelinux.cfg_default
@@ -6,9 +6,12 @@ F1 message.txt
 F2 f2.txt
 label huge.s
   kernel kernels/huge.s/bzImage
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 nomodeset SLACK_KERNEL=huge.s
+label kms.s
+  kernel kernels/huge.s/bzImage
   append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
 label speakup.s
   kernel kernels/huge.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 nomodeset SLACK_KERNEL=huge.s
 label memtest
   kernel kernels/memtest/memtest
diff --git a/usb-and-pxe-installers/usbimg2disk.sh b/usb-and-pxe-installers/usbimg2disk.sh
index df3f574fc..ec5a735ac 100644
--- a/usb-and-pxe-installers/usbimg2disk.sh
+++ b/usb-and-pxe-installers/usbimg2disk.sh
@@ -455,34 +455,8 @@ mkdir -p $MNTDIR2/syslinux
 cp -R $MNTDIR1/* $MNTDIR2/syslinux/
 rm -f $MNTDIR2/syslinux/ldlinux.sys
 
-# If we are creating a full Slackware installer, there is a lot more to do:
+# If we are creating a full Slackware installer, copy the package tree:
 if [ "$FULLINSTALLER" = "yes" ]; then
-  # Extract the Slackware initrd for modifications we have to do:
-  echo "--- Extracting Slackware initrd.img..."
-  ( cd ${MNTDIR3}/
-    gunzip -cd ${MNTDIR2}/syslinux/initrd.img | cpio -i -d -H newc --no-absolute-filenames
-  ) 2>>$LOGFILE
-
-  # Modify installer files so that installing from USB stick will be easier:
-  echo "--- Modifying installer files..."
-  ( cd ${MNTDIR3}/
-    # Try to automatically mount the installer partition:
-    mkdir usbinstall
-    echo "mount -t vfat -o ro,shortname=mixed \$(/sbin/blkid -t LABEL=$FATLABEL | cut -f1 -d:) /usbinstall 1>/dev/null 2>&1" >> etc/rc.d/rc.S
-    # Adapt the dialogs so that pressing [OK] will be all there is to it:
-    sed -i -e 's# --menu# --default-item 6 --menu#' usr/lib/setup/SeTmedia
-    sed -i -e "s# 2> \$TMP/sourcedir# /usbinstall/$(basename $REPOSROOT)/$PKGDIR 2> \$TMP/sourcedir#" usr/lib/setup/INSdir
-    FIXF=$(find usr/lib/setup -name SeTp*media)
-    sed -i -e 's# --menu# --default-item 3 --menu#' $FIXF
-  ) 2>>$LOGFILE
-
-  # Recreate the initrd:
-  echo "--- Gzipping the initrd image again:"
-  chmod 0755 ${MNTDIR3}
-  ( cd ${MNTDIR3}/
-    find . |cpio -o -H newc |gzip > ${MNTDIR2}/syslinux/initrd.img
-  ) 2>>$LOGFILE
-
   # Copy Slackware package tree (no sources) to the USB disk -
   # we already made sure that ${REPOSROOT} does not end with a '/'
   echo "--- Copying Slackware package tree to the USB drive..."