From 388986876373b8d6d9053c36196978464bd3362e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 28 Nov 2018 07:25:32 +0000
Subject: Wed Nov 28 07:25:32 UTC 2018

a/elilo-3.16-x86_64-9.txz:  Rebuilt.
  eliloconfig: don't assume that mount output lists the / partition first.
a/f2fs-tools-1.12.0-x86_64-1.txz:  Added.
a/kernel-generic-4.19.5-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.5-x86_64-1.txz:  Upgraded.
 CRYPTO_CRC32 m -> y
 F2FS_FS m -> y
a/kernel-modules-4.19.5-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-22.txz:  Rebuilt.
  rc.S: if we're using F2FS for the root filesystem, don't try to check it as
  fsck.f2fs throws an error on trying to check a read-only filesystem.
d/clisp-2.49_20181112_df3b9f6fd-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.5-x86-1.txz:  Upgraded.
k/kernel-source-4.19.5-noarch-1.txz:  Upgraded.
l/graphite2-1.3.12-x86_64-1.txz:  Added.
  Required by harfbuzz in order to use it as a system library for TeXlive.
l/harfbuzz-2.1.3-x86_64-1.txz:  Upgraded.
  Requires graphite2-1.3.12.
t/texlive-2018.180822-x86_64-4.txz:  Rebuilt.
  Use system harfbuzz, not the bundled version.
isolinux/initrd.img:  Rebuilt.
  Activate LVM volumes at boot, not only when setup is run.
  Make /etc/mtab a symlink to /proc/mounts on the installer.
  On a freshly installed system, make /etc/mtab a symlink to /proc/mounts.
  Include f2fs-tools on the installer.
  Support installing on F2FS partitions.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/sysvinit-scripts/scripts/rc.S                | 9 +++++++--
 source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'source/a/sysvinit-scripts')

diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index e689e458..a382bd55 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -229,8 +229,13 @@ if [ -r /etc/forcefsck ]; then
   FORCEFSCK="-f"
 fi
 
-# Check the root filesystem:
-if [ ! $READWRITE = yes ]; then
+# If we're using F2FS for the root filesystem, don't check it as it doesn't
+# allow checking a read-only filesystem:
+if [ "$(cat /etc/fstab | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f 3 -d ' ')" = "f2fs" ]; then
+  echo "Remounting root device with read-write enabled."
+  /sbin/mount -w -v -n -o remount /
+elif [ ! $READWRITE = yes ]; then
+  # Check the root filesystem:
   RETVAL=0
   if [ ! -r /etc/fastboot ]; then
     echo "Checking root filesystem:"
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 9b357596..aafd0143 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:-21}
+BUILD=${BUILD:-22}
 
 # 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
-- 
cgit v1.2.3