Browse Source

remove sysuser: as we have hook

2.3.1
Nathan Owens 1 year ago
parent
commit
db91ba821f
  1. 1
      Makefile
  2. 6
      configure
  3. 3
      module/boot@/configure/configure
  4. 1
      module/boot@/service/all-Local
  5. 19
      module/boot@/service/local/local-sysusers

1
Makefile

@ -72,7 +72,6 @@ $(DESTDIR)$(service_directory)/%: service/%
-e "s,@LOCAL@,$(LOCAL)," \
-e "s,@CONTAINER@,$(CONTAINER)," \
-e "s,@TMPFILE@,$(TMPFILE)," \
-e "s,@SYSUSER@,$(SYSUSER)," \
-e "s,@MODULE_KERNEL@,$(MODULE_KERNEL)," \
-e "s,@MODULE_SYSTEM@,$(MODULE_SYSTEM)," \
-e "s,@RANDOMSEED@,$(RANDOMSEED)," \

6
configure vendored

@ -41,7 +41,6 @@ Fine tunning of boot configuration:
--LOCAL=BOOLEAN use rc.local scripts [!no]
--CONTAINER=BOOLEAN boot inside a container [!no]
--TMPFILE=BOOLEAN use tmpfiles.d files [!yes]
--SYSUSER=BOOLEAN use sysusers.d files [!yes]
--MODULE_KERNEL=BOOLEAN load modules kernel [!yes]
--MODULE_SYSTEM=BOOLEAN load modules from modules.d files [!yes]
--RANDOMSEED=BOOLEAN set random seed [!yes]
@ -157,7 +156,6 @@ FORCECHCK='!no'
LOCAL='!no'
CONTAINER='!no'
TMPFILE='!yes'
SYSUSER='!yes'
MODULE_KERNEL='!yes'
MODULE_SYSTEM='!yes'
RANDOMSEED='!yes'
@ -215,7 +213,6 @@ for arg ; do
--LOCAL=*) LOCAL=${arg#*=} ;;
--CONTAINER=*) CONTAINER=${arg#*=} ;;
--TMPFILE=*) TMPFILE=${arg#*=} ;;
--SYSUSER=*) SYSUSER=${arg#*=} ;;
--MODULE_KERNEL=*) MODULE_KERNEL=${arg#*=} ;;
--MODULE_SYSTEM=*) MODULE_SYSTEM=${arg#*=} ;;
--RANDOMSEED=*) RANDOMSEED=${arg#*=} ;;
@ -294,7 +291,7 @@ done
for i in HOSTNAME HARDWARECLOCK TZ SETUPCONSOLE TTY \
KEYMAP FONT FONT_MAP FONT_UNIMAP UDEV SYSCTL FORCECHCK LOCAL CONTAINER \
TMPFILE SYSUSER MODULE_KERNEL MODULE_SYSTEM RANDOMSEED \
TMPFILE MODULE_KERNEL MODULE_SYSTEM RANDOMSEED \
FSTAB SWAP LVM DMRAID BTRFS ZFS ZFS_IMPORT \
CRYPTTAB FIREWALL \
CGROUPS MNT_PROC MNT_SYS MNT_DEV MNT_RUN MNT_TMP \
@ -360,7 +357,6 @@ $FORCECHCK
$LOCAL
$CONTAINER
$TMPFILE
$SYSUSER
$MODULE_KERNEL
$MODULE_SYSTEM
$RANDOMSEED

3
module/boot@/configure/configure vendored

@ -11,7 +11,7 @@ service_dir="${MOD_MODULE_DIR}/service"
SV_REAL=
sv_boolean_list="CRYPTTAB SETUPCONSOLE FSTAB SWAP LVM \
DMRAID BTRFS ZFS UDEV SYSCTL LOCAL CONTAINER TMPFILE SYSUSER MODULE_KERNEL \
DMRAID BTRFS ZFS UDEV SYSCTL LOCAL CONTAINER TMPFILE MODULE_KERNEL \
MODULE_SYSTEM RANDOMSEED MNT_PROC MNT_SYS MNT_DEV MNT_RUN MNT_TMP CGROUPS \
MNT_PTS MNT_SHM MNT_NETFS POPULATE_SYS POPULATE_DEV POPULATE_RUN POPULATE_TMP"
@ -47,7 +47,6 @@ retrieve_sv_name(){
FORCECHCK) SV_REAL="system-fsck" ;;
LOCAL) SV_REAL="local-rc" ;;
TMPFILE) SV_REAL="local-tmpfiles" ;;
SYSUSER) SV_REAL="local-sysusers" ;;
MODULE_KERNEL) SV_REAL="modules-kernel" ;;
MODULE_SYSTEM) SV_REAL="modules-system" ;;
RANDOMSEED) SV_REAL="system-random" ;;

1
module/boot@/service/all-Local

@ -18,7 +18,6 @@ local-sethostname
local-time
local-authfiles
local-tmpfiles
local-sysusers
local-rc
local-dmesg
)

19
module/boot@/service/local/local-sysusers

@ -1,19 +0,0 @@
[main]
@type = oneshot
@version = @vers@
@description = "Create sysusers entries"
@depends = ( mount-rw )
@user = ( root )
@options = ( !log )
[start]
@execute =
(
if { 66-yeller -cdp local-sysusers -1 /dev/console starts... }
if -nt {
execl-cmdline -s { sysusers }
}
66-yeller -fcdp local-sysusers -1 /dev/console crashed!
)
Loading…
Cancel
Save