diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2016-05-27 20:17:40 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2016-05-27 20:17:40 +0000 |
| commit | 47803e6cebc62cc349699eea08f213309e3fe99e (patch) | |
| tree | 0b5660a2de2d00611dac3e2b6afa644ba6938e08 /distrib/miniroot/install.sub | |
| parent | 78b5afaf3f7a760112fbfce28204da6440738775 (diff) | |
During install, set new 'wxallowed' mount option for the filesystem
/usr/local resides on.
idea from and ok deraadt
with feedback from halex
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index eb0f11ac932..e1d4c7e1d42 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.899 2016/05/26 15:27:09 rpe Exp $ +# $OpenBSD: install.sub,v 1.900 2016/05/27 20:17:39 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2475,6 +2475,11 @@ do_install(){ # Ask the user for locations, and install whatever sets the user selected. install_sets + + # Set 'wxallowed' mount option for the filesystem /usr/local resides on. + _mp=$(df /mnt/usr/local | sed '$!d') + _mp=${_mp##*/mnt} + sed -i "s#\(${_mp:-/} ffs rw\)#\1,wxallowed#" /tmp/fstab # If we did not succeed at setting TZ yet, we try again # using the timezone names extracted from the base set. |