Browse Source

really add POPULATE_{SYS,DEV}

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

10
configure vendored

@ -60,6 +60,8 @@ Fine tunning of boot configuration:
--MNT_PTS=BOOLEAN mount /dev/pts [!yes]
--MNT_SHM=BOOLEAN mount /dev/shm [!yes]
--MNT_NETFS=BOOLEAN mount no-network filesystems [!yes]
--POPULATE_SYS=BOOLEAN populate sys directory [!yes]
--POPULATE_DEV=BOOLEAN populate dev directory [!yes]
--POPULATE_RUN=BOOLEAN populate run directory [!yes]
--POPULATE_TMP=BOOLEAN populate tmp directory [!yes]
@ -171,6 +173,8 @@ MNT_TMP='!yes'
MNT_PTS='!yes'
MNT_SHM='!yes'
MNT_NETFS='!yes'
POPULATE_SYS='!yes'
POPULATE_DEV='!yes'
POPULATE_RUN='!yes'
POPULATE_TMP='!yes'
@ -224,6 +228,8 @@ for arg ; do
--MNT_PTS=*) MNT_PTS=${arg#*=} ;;
--MNT_SHM=*) MNT_SHM=${arg#*=} ;;
--MNT_NETFS=*) MNT_NETFS=${arg#*=} ;;
--POPULATE_SYS=*) POPULATE_SYS=${arg#*=} ;;
--POPULATE_DEV=*) POPULATE_DEV=${arg#*=} ;;
--POPULATE_RUN=*) POPULATE_RUN=${arg#*=} ;;
--POPULATE_TMP=*) POPULATE_TMP=${arg#*=} ;;
-* ) echo "$0: unknown option $arg" ;;
@ -283,7 +289,7 @@ for i in HOSTNAME HARDWARECLOCK TZ SETUPCONSOLE \
FSTAB SWAP LVM DMRAID BTRFS ZFS \
CRYPTTAB IPTABLES IP6TABLES \
CGROUPS MNT_PROC MNT_SYS MNT_DEV MNT_RUN MNT_TMP \
MNT_PTS MNT_SHM MNT_NETFS POPULATE_RUN POPULATE_TMP ; do
MNT_PTS MNT_SHM MNT_NETFS POPULATE_SYS POPULATE_DEV POPULATE_RUN POPULATE_TMP ; do
eval tmp=\${$i}
if testval $tmp; then
eval $i='#${i}='
@ -364,6 +370,8 @@ $MNT_TMP
$MNT_PTS
$MNT_SHM
$MNT_NETFS
$POPULATE_SYS
$POPULATE_DEV
$POPULATE_RUN
$POPULATE_TMP
EOF

6
module/boot@/.configure/configure vendored

@ -32,6 +32,8 @@ sv_boolean_list=(
MNT_PTS
MNT_SHM
MNT_NETFS
POPULATE_SYS
POPULATE_DEV
POPULATE_RUN
POPULATE_TMP')
@ -91,12 +93,12 @@ retrieve_sv_name(){
MNT_PTS) SV_REAL="mount-pts" ;;
MNT_SHM) SV_REAL="mount-shm" ;;
MNT_NETFS) SV_REAL="mount-netfs" ;;
POPULATE_SYS) SV_REAL="populate-sys" ;;
POPULATE_DEV) SV_REAL="populate-dev" ;;
POPULATE_RUN) SV_REAL="populate-run" ;;
POPULATE_TMP) SV_REAL="populate-tmp" ;;
## extra service not set by the environment section
UDEV_ADM) SV_REAL="udevadm" ;;
POPULATE_SYS) SV_REAL="populate-sys" ;;
POPULATE_DEV) SV_REAL="populate-dev" ;;
esac
unset sv

4
service/boot@

@ -24,12 +24,12 @@
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
#
# @bootconf@ - system configuration for Obarun running s6/s6-rc
# System configuration file for a boot process running s6/s6-rc
# supervision suite and handled by 66 suite program.
#
# Do not use quotes or double-quotes on this file
#
# The '!' is used to unexport the variable from the environment.
# The '!' is used to not export the variable on the environment.
# If you want to keep it, remove the exclamation mark '!'.
#
#========================== WARNING ====================================

Loading…
Cancel
Save