diff options
| author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2004-09-17 17:58:19 +0000 |
|---|---|---|
| committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2004-09-17 17:58:19 +0000 |
| commit | 9468063a703732468ed97cde73ca841e1d98486a (patch) | |
| tree | 0132b354280edcc698db950d4571b6d1ac538869 /etc | |
| parent | 0a16dedc071c88ea942e9a08a235e80ea9280c4f (diff) | |
| download | src-9468063a703732468ed97cde73ca841e1d98486a.tar.gz src-9468063a703732468ed97cde73ca841e1d98486a.zip | |
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).
Notes
Notes:
svn path=/head/; revision=135389
Diffstat (limited to 'etc')
| -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 928210adc71e..29af8e8545fe 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" |