3 files changed, 5 insertions, 9 deletions
diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild
index 2de9fe6a..60f7eb37 100755
--- a/source/a/btrfs-progs/btrfs-progs.SlackBuild
+++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -51,7 +51,7 @@ fi
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  echo "$PKGNAM-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -150,14 +150,14 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+mkdir -p $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 cp -a \
   COPYING* INSTALL README* \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
+  $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $TMP/package-${PKGNAM}
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz
 
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index e53cd96d..4162938f 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -274,7 +274,6 @@ elif [ ! $READWRITE = yes ]; then
     /sbin/umount -a -r
     /sbin/mount -n -o remount,ro /
     echo "Rebooting system."
-    sleep 2
     reboot -f
   fi
   # Remount the root filesystem in read-write mode
@@ -358,10 +357,7 @@ fi
 # because those have already been mounted.  Also check that
 # devpts is not already mounted before attempting to mount
 # it.  With a 2.6.x or newer kernel udev mounts devpts.
-# We also need to wait a little bit to let USB and other
-# hotplugged devices settle (sorry to slow down the boot):
 echo "Mounting non-root local filesystems:"
-sleep 3
 if /bin/grep -wq devpts /proc/mounts ; then
   # This pipe after the mount command is just to convert the new
   # mount verbose output back to the old format that contained
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 4bc29169..4f2588ea 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=sysvinit-scripts
 VERSION=${VERSION:-2.1}
 ARCH=noarch
-BUILD=${BUILD:-25}
+BUILD=${BUILD:-26}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information