From 777a7482fccd6175753d1c776e7270a0662413ef Mon Sep 17 00:00:00 2001 From: krw Date: Tue, 9 Jul 2024 14:47:21 +0000 Subject: [PATCH] Removing 'softdep' options from fstab entries during upgrade is no longer necessary as 'softdep' is now a no-op. ok beck@ sthen@ --- distrib/miniroot/install.sub | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d73b8037210..e0c235a7c0a 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1265 2024/06/15 15:05:15 florian Exp $ +# $OpenBSD: install.sub,v 1.1266 2024/07/09 14:47:21 krw Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -2675,10 +2675,9 @@ start_cgiinfo() { # # In addition, # -# 1) delete 'softdep' options (no soft updates in ramdisk kernels), -# 2) mount non-ffs filesystems read only, -# 3) prepend '/mnt' to all mount points, -# 4) delete any trailing '/' from the mount point (e.g. root), +# 1) mount non-ffs filesystems read only, +# 2) prepend '/mnt' to all mount points, +# 3) delete any trailing '/' from the mount point (e.g. root), # # If no /etc/fstab is created, do not proceed with install/upgrade. munge_fstab() { @@ -2692,10 +2691,6 @@ munge_fstab() { $_opt == *noauto* || $_opt == *xx* ]] && continue - # Remove any softdep options, as soft updates are not - # available in the ramdisk kernels. - _opt=$(echo $_opt | sed 's/softdep//') - # Change read-only ffs to read-write since we'll potentially # write to these filesystems. # Mount non-ffs filesystems read only. -- 2.20.1