aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-07-24 00:11:02 (GMT)
committerTom Gundersen <teg@jklm.no>2012-07-24 00:11:12 (GMT)
commit13ca7f028ac775773a6685966d0faeee5cc55a9d (patch)
tree74e722916d80b63bdf16b2937481ff6d64149b16
parent741979f5bfa6df16c9290bcba532beb11276e287 (diff)
downloadinitscripts-13ca7f028ac775773a6685966d0faeee5cc55a9d.tar.xz
btrfs: remove USEBTRFS
This is now handled by udev. Leaving it set does no harm. Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r--rc.conf1
-rw-r--r--rc.conf.5.txt8
-rwxr-xr-xrc.sysinit4
3 files changed, 0 insertions, 13 deletions
diff --git a/rc.conf b/rc.conf
index 7ebba72..bf6a9e4 100644
--- a/rc.conf
+++ b/rc.conf
@@ -13,7 +13,6 @@ DAEMONS=(syslog-ng network crond)
# Storage
#
# USEDMRAID="no"
-# USEBTRFS="no"
# USELVM="no"
# Network
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index 7b361ab..73c2423 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -47,14 +47,6 @@ Default: 'no'
USEDMRAID="yes"
-*USEBTRFS=*
-
-Scan for Btrfs volumes at start-up.
-
-Default: 'no'
-
- USEBTRFS="yes"
-
*USELVM=*
Scan for LVM volume groups at start-up. This is required if you use LVM.
diff --git a/rc.sysinit b/rc.sysinit
index 6f1ac9c..ed796c7 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -70,10 +70,6 @@ status 'Configuring virtual consoles' /usr/lib/systemd/systemd-vconsole-setup
[[ $USEDMRAID = [Yy][Ee][Ss] && -x $(type -P dmraid) ]] &&
status "Activating FakeRAID arrays" dmraid -i -ay
-# Btrfs devices detection
-[[ $USEBTRFS = [Yy][Ee][Ss] && -x $(type -P btrfs) ]] &&
- status "Activating Btrfs volumes" btrfs device scan
-
# Activate LVM2 groups, if any
activate_vgs