mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Removing 'softdep' options from fstab entries during upgrade is no longer

Browse Source 
necessary as 'softdep' is now a no-op.

ok beck@ sthen@
This commit is contained in:
krw 2024-07-09 14:47:21 +00:00
parent 9acc614c14
commit 777a7482fc
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
distrib/miniroot/install.sub
View File

@ -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 <rpe@openbsd.org>
@ -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.