aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--rc.conf1
-rw-r--r--rc.conf.5.txt8
-rwxr-xr-xrc.sysinit4
4 files changed, 1 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 9ada25b..5ac71da 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ tar:
git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz
release: tar
- scp initscripts-$(VER).tar.xz gerolde.archlinux.org:/srv/ftp/other/initscripts/
scp initscripts-$(VER).tar.xz pkgbuild.com:~/packages/initscripts/trunk/
+ scp initscripts-$(VER).tar.xz gerolde.archlinux.org:/srv/ftp/other/initscripts/
.PHONY: all installdirs install doc clean tar release
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