diff options
| author | pjd <pjd@FreeBSD.org> | 2004-09-17 17:58:19 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-09-17 17:58:19 +0000 |
| commit | 566c62aad22c4961d5511b9cf1954d16e2621bf7 (patch) | |
| tree | 0132b354280edcc698db950d4571b6d1ac538869 /etc/rc.d | |
| parent | 91a280661ab912c767c70fda46369262796d5af3 (diff) | |
| download | FreeBSD-src-566c62aad22c4961d5511b9cf1954d16e2621bf7.zip FreeBSD-src-566c62aad22c4961d5511b9cf1954d16e2621bf7.tar.gz | |
Teach swap1 script how to remove added swap devices on system shutdown.
Without this change, if one had a swap-on-mirror configuration, gmirror
will rebuild mirror component(s) on boot, because they are dirty (they
were open on shutdown).
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/swap1 | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1 index 928210a..29af8e8 100755 --- a/etc/rc.d/swap1 +++ b/etc/rc.d/swap1 @@ -12,27 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd=':' - -# Add all block-type swap devices; these might be necessary -# during disk checks. -# -swap1_start() -{ - if ! checkyesno no_swap; then - swapctl -A -t blk - fi -} - -# Remove all block-type swap devices -# -swap1_stop() -{ - if checkyesno swapoff || [ -n "$rc_force" ]; then - echo "Removing block-type swap devices" - swapctl -U -t blk - fi -} +stop_cmd='swapoff -a' load_rc_config swap run_rc_command "$1" |
