Browse Source

better name of zfs variable

2.3.1
obarun 2 years ago
parent
commit
eb827dee18
  1. 2
      Makefile
  2. 10
      configure
  3. 2
      module/boot@/configure/configure
  4. 4
      service/boot@

2
Makefile

@ -70,7 +70,7 @@ $(DESTDIR)$(service_directory)/%: service/%
-e "s,@DMRAID@,$(DMRAID)," \
-e "s,@BTRFS@,$(BTRFS)," \
-e "s,@ZFS@,$(ZFS)," \
-e "s,@ZPOOL@,$(ZPOOL)," \
-e "s,@ZFS_IMPORT@,$(ZFS_IMPORT)," \
-e "s,@CRYPTTAB@,$(CRYPTTAB)," \
-e "s,@IPTABLES@,$(IPTABLES)," \
-e "s,@IP6TABLES@,$(IP6TABLES)," \

10
configure vendored

@ -49,7 +49,7 @@ Fine tunning of boot configuration:
--DMRAID=BOOLEAN mount dmraid devices [!no]
--BTRFS=BOOLEAN mount btrfs devices [!no]
--ZFS=BOOLEAN mount zfs devices [!no]
--ZPOOL=VALUE zpool method to import zfs devices [!scan]
--ZFS_IMPORT=VALUE zpool method to import zfs devices [!scan]
--CRYPTTAB=BOOLEAN use crypttab by default [!no]
--IPTABLES=BOOLEAN use iptables by default [!no]
--IP6TABLES=BOOLEAN use ip6tables by default [!no]
@ -164,7 +164,7 @@ LVM='!no'
DMRAID='!no'
BTRFS='!no'
ZFS='!no'
ZPOOL='!scan'
ZFS_IMPORT='!scan'
CRYPTTAB='!no'
IPTABLES='!no'
IP6TABLES='!no'
@ -221,7 +221,7 @@ for arg ; do
--DMRAID=*) DMRAID=${arg#*=} ;;
--BTRFS=*) BTRFS=${arg#*=} ;;
--ZFS=*) ZFS=${arg#*=} ;;
--ZPOOL=*) ZPOOL=${arg#*=} ;;
--ZFS_IMPORT=*) ZFS_IMPORT=${arg#*=} ;;
--CRYPTTAB=*) CRYPTTAB=${arg#*=} ;;
--IPTABLES=*) IPTABLES=${arg#*=} ;;
--IP6TABLES=*) IP6TABLES=${arg#*=} ;;
@ -292,7 +292,7 @@ done
for i in HOSTNAME HARDWARECLOCK TZ SETUPCONSOLE TTY \
KEYMAP FONT FONT_MAP FONT_UNIMAP UDEV SYSCTL FORCECHCK LOCAL CONTAINER \
TMPFILE MODULE_KERNEL MODULE_SYSTEM RANDOMSEED \
FSTAB SWAP LVM DMRAID BTRFS ZFS ZPOOL \
FSTAB SWAP LVM DMRAID BTRFS ZFS ZFS_IMPORT \
CRYPTTAB IPTABLES IP6TABLES \
CGROUPS MNT_PROC MNT_SYS MNT_DEV MNT_RUN MNT_TMP \
MNT_PTS MNT_SHM MNT_NETFS POPULATE_SYS POPULATE_DEV POPULATE_RUN POPULATE_TMP ; do
@ -365,7 +365,7 @@ $LVM
$DMRAID
$BTRFS
$ZFS
$ZPOOL
$ZFS_IMPORT
$CRYPTTAB
$IPTABLES
$IP6TABLES

2
module/boot@/configure/configure vendored

@ -151,7 +151,7 @@ if [ "${CONTAINER}" = "yes" ]; then
fi
if [ "${ZFS}" = "yes" ]; then
if [ "${ZPOOL}" = "cache" ]; then
if [ "${ZFS_IMPORT}" = "cache" ]; then
sv_comment_real "devices-zfs-import-scan"
else
# set default to scan

4
service/boot@

@ -150,10 +150,10 @@
@ZFS@
## Zpool method to import zfs devices [scan|cache]
## Zpool method to import zfs devices [scan|zpoolcache]
## It has no effects if ZFS is commented.
@ZPOOL@
@ZFS_IMPORT@
#========================== Security ===================================

Loading…
Cancel
Save