Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

3 files changed, 69 insertions, 4 deletions

diff --git a/testing/source/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild
index 708e15840..ebbd9a536 100755
--- a/testing/source/btrfs-progs/btrfs-progs.SlackBuild
+++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -74,8 +74,13 @@ find . -perm 511 -exec chmod 755 {} \;
 find . -perm 711 -exec chmod 755 {} \;
 find . -perm 555 -exec chmod 755 {} \;
 
-# Build and install:
+# Build:
 make $NUMJOBS || make || exit 1
+
+# Build ext* conversion utility:
+make $NUMJOBS convert || make convert || exit 1
+
+# Install:
 make install DESTDIR=$PKG || exit 1
 
 # Strip binaries:
@@ -89,7 +94,10 @@ mv $PKG/usr/local/bin $PKG/sbin
 mv $PKG/usr/local/man $PKG/usr/man
 rmdir $PKG/usr/local
 
-( cd $PKG/sbin ; ln -sf btrfsck fsck.btrfs )
+# Add an fsck.btrfs script.  For now this serves to eat options such as -a
+# that would otherwise cause issues for btrfs at boot time.
+cat $CWD/fsck.btrfs > $PKG/sbin/fsck.btrfs
+chmod 755 $PKG/sbin/fsck.btrfs
 
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
@@ -109,7 +117,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING INSTALL \
+  COPYING* INSTALL README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
diff --git a/source/a/btrfs-progs/fsck.btrfs b/source/a/btrfs-progs/fsck.btrfs
new file mode 100644
index 000000000..779e0b794
--- /dev/null
+++ b/source/a/btrfs-progs/fsck.btrfs
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Currently, btrfsck does not recognize any options, so eat any initial options
+# beginning with '-'.  Then, check the remaining args with btrfsck only if they
+# exist and are readable.
+
+# Strip initial args:
+while [ ! -z "$1" ]; do
+  if [ "$(echo $1 | cut -b1)" = "-" ]; then
+    shift # strip option from command line
+  else
+    break
+  fi
+done
+
+# Main filesystem check loop:
+RETVAL=0
+while [ ! -z "$1" ]; do
+  if [ -r "$1" ]; then
+    echo "fsck.btrfs:  Checking filesystem on $1"
+    # Checking the root filesystem (even read-only) will fail, check for that:
+    if ! grep -w "$1" /etc/fstab | grep -wq / ; then
+      btrfsck "$1"
+      ERRCODE=$?
+      if [ ! $ERRCODE = 0 ]; then
+        RETVAL=$ERRCODE
+      fi
+    else
+      echo "  $1 mounted on /, skipped."
+    fi
+  fi
+  shift
+done
+
+# If there was an error, return the most recent error code:
+exit $RETVAL
+
diff --git a/testing/source/btrfs-progs/slack-desc b/source/a/btrfs-progs/slack-desc
index e9088d053..e9088d053 100644
--- a/testing/source/btrfs-progs/slack-desc
+++ b/source/a/btrfs-progs/slack-desc