[Initng-svn] r3190 - in initng/trunk/initfiles: daemon debug net
system
svn at initng.thinktux.net
svn at initng.thinktux.net
Sat Mar 4 14:47:42 CET 2006
Author: deac
Date: Sat Mar 4 14:47:40 2006
New Revision: 3190
Added:
initng/trunk/initfiles/daemon/pppoe.ii
- copied, changed from r3185, initng/trunk/initfiles/daemon/adsl.ii
Removed:
initng/trunk/initfiles/daemon/adsl.ii
initng/trunk/initfiles/daemon/dhclient-old.ii
initng/trunk/initfiles/system/alsasound-old.ii
initng/trunk/initfiles/system/dotnet.ii
initng/trunk/initfiles/system/static-modules.ii
Modified:
initng/trunk/initfiles/daemon/dhclient.ii
initng/trunk/initfiles/daemon/dhcpcd.ii
initng/trunk/initfiles/daemon/dnsmasq.ii
initng/trunk/initfiles/daemon/entranced.ii
initng/trunk/initfiles/daemon/gdm.ii
initng/trunk/initfiles/daemon/ifplugd.ii
initng/trunk/initfiles/daemon/kdm.ii
initng/trunk/initfiles/daemon/ldm.ii
initng/trunk/initfiles/daemon/lighttpd.ii
initng/trunk/initfiles/daemon/lircd.ii
initng/trunk/initfiles/daemon/netdaemon.ii
initng/trunk/initfiles/daemon/udhcpc.ii
initng/trunk/initfiles/daemon/wdm.ii
initng/trunk/initfiles/daemon/xdm.ii
initng/trunk/initfiles/debug/buggy.ii
initng/trunk/initfiles/net/net.ii
initng/trunk/initfiles/system/Makefile.am
initng/trunk/initfiles/system/alsasound.ii
initng/trunk/initfiles/system/clock.ii
initng/trunk/initfiles/system/coldplug.ii
initng/trunk/initfiles/system/lm-sensors.ii
initng/trunk/initfiles/system/modules.ii
initng/trunk/initfiles/system/ntpdate.ii
initng/trunk/initfiles/system/speedstep.ii
initng/trunk/initfiles/system/wifi-radar.ii
Log:
system/static-modules => system/modules, system/modules => system/modules/depmod
Modified: initng/trunk/initfiles/daemon/dhclient.ii
==============================================================================
--- initng/trunk/initfiles/daemon/dhclient.ii (original)
+++ initng/trunk/initfiles/daemon/dhclient.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/dhclient/* {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
stdout = /var/log/dhclient.${NAME};
exec daemon = @/sbin/dhclient@ -d ${NAME};
#pid_file = /var/run/dhclient-${NAME}.pid;
Modified: initng/trunk/initfiles/daemon/dhcpcd.ii
==============================================================================
--- initng/trunk/initfiles/daemon/dhcpcd.ii (original)
+++ initng/trunk/initfiles/daemon/dhcpcd.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/dhcpcd/* {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
#ifd arch
pid_file = /etc/dhcpc/dhcpcd-${NAME}.pid;
#elsed
Modified: initng/trunk/initfiles/daemon/dnsmasq.ii
==============================================================================
--- initng/trunk/initfiles/daemon/dnsmasq.ii (original)
+++ initng/trunk/initfiles/daemon/dnsmasq.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/dnsmasq {
need = system/initial system/mountroot system/modules system/hostname;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
stdall = /dev/null;
exec daemon = @/usr/sbin/dnsmasq@;
pid_file = /var/run/dnsmasq.pid;
Modified: initng/trunk/initfiles/daemon/entranced.ii
==============================================================================
--- initng/trunk/initfiles/daemon/entranced.ii (original)
+++ initng/trunk/initfiles/daemon/entranced.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,5 @@
daemon daemon/entranced {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
exec daemon = @/usr/sbin/entranced@;
pid_file = /var/run/entranced.pid;
respawn;
Modified: initng/trunk/initfiles/daemon/gdm.ii
==============================================================================
--- initng/trunk/initfiles/daemon/gdm.ii (original)
+++ initng/trunk/initfiles/daemon/gdm.ii Sat Mar 4 14:47:40 2006
@@ -1,11 +1,11 @@
daemon daemon/gdm {
need = system/bootmisc;
#ifd pingwinek
- use = daemon/xfs system/static-modules system/coldplug system/faketty system/xorgconf system/dbus;
+ use = daemon/xfs system/faketty system/xorgconf system/dbus;
#elsed
- use = daemon/xfs system/static-modules system/coldplug system/faketty system/xorgconf;
+ use = daemon/xfs system/faketty system/xorgconf;
#endd
- conflict = daemon/kdm daemon/wdm daemon/xdm;
+ conflict = daemon/kdm daemon/wdm daemon/xdm daemon/entranced;
#ifd debian
env_file = /etc/default/gdm;
# Latest gdm lives in /usr/sbin - temporary workaround
Modified: initng/trunk/initfiles/daemon/ifplugd.ii
==============================================================================
--- initng/trunk/initfiles/daemon/ifplugd.ii (original)
+++ initng/trunk/initfiles/daemon/ifplugd.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/ifplugd/* {
need = system/bootmisc;
- use = system/static-modules system/coldplug system/ifrename;
+ use = system/modules system/coldplug system/ifrename;
stdout = /dev/null;
stderr = /dev/null;
#ifd debian
@@ -24,7 +24,7 @@
service daemon/ifplugd {
need = system/bootmisc;
- use = system/static-modules system/coldplug system/ifrename;
+ use = system/modules system/coldplug system/ifrename;
#stdall = /dev/null;
#ifd debian
Modified: initng/trunk/initfiles/daemon/kdm.ii
==============================================================================
--- initng/trunk/initfiles/daemon/kdm.ii (original)
+++ initng/trunk/initfiles/daemon/kdm.ii Sat Mar 4 14:47:40 2006
@@ -1,7 +1,7 @@
daemon daemon/kdm {
need = system/bootmisc;
conflict = daemon/gdm daemon/wdm daemon/xdm;
- use = daemon/xfs system/static-modules system/coldplug system/faketty;
+ use = daemon/xfs system/modules system/coldplug system/faketty;
#ifd debian
exec daemon = @/usr/bin/kdm@ -nodaemon;
#elsed
Modified: initng/trunk/initfiles/daemon/ldm.ii
==============================================================================
--- initng/trunk/initfiles/daemon/ldm.ii (original)
+++ initng/trunk/initfiles/daemon/ldm.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/ldm {
need = system/bootmisc;
- use = daemon/xfs system/static-modules system/coldplug system/netmount;
+ use = daemon/xfs system/modules system/coldplug system/netmount;
nice = -4;
exec daemon = @/usr/bin/ldm@;
}
Modified: initng/trunk/initfiles/daemon/lighttpd.ii
==============================================================================
--- initng/trunk/initfiles/daemon/lighttpd.ii (original)
+++ initng/trunk/initfiles/daemon/lighttpd.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/lighttpd {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
require_network;
exec daemon = @/usr/sbin/lighttpd@ -D -f /etc/lighttpd/lighttpd.conf;
}
Modified: initng/trunk/initfiles/daemon/lircd.ii
==============================================================================
--- initng/trunk/initfiles/daemon/lircd.ii (original)
+++ initng/trunk/initfiles/daemon/lircd.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/lircd {
need = system/bootmisc system/modules;
- use = system/discover system/coldplug system/static-modules;
+ use = system/discover system/coldplug system/modules;
#ifd gentoo
env_file = /etc/conf.d/lircd;
exec daemon = @/usr/sbin/lircd@ ${LIRCD_OPTS} -P /var/run/lircd.pid;
Modified: initng/trunk/initfiles/daemon/netdaemon.ii
==============================================================================
--- initng/trunk/initfiles/daemon/netdaemon.ii (original)
+++ initng/trunk/initfiles/daemon/netdaemon.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/netdaemon {
need = system/bootmisc;
- use = system/coldplug system/static-modules;
+ use = system/coldplug system/modules;
exec daemon = @/usr/sbin/netdaemon@;
pid_of = netdaemon;
}
Copied: initng/trunk/initfiles/daemon/pppoe.ii (from r3185, initng/trunk/initfiles/daemon/adsl.ii)
==============================================================================
--- initng/trunk/initfiles/daemon/adsl.ii (original)
+++ initng/trunk/initfiles/daemon/pppoe.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service daemon/adsl {
need = system/mountfs system/modules system/hostname net/eth0;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
exec start = @adsl-start@;
exec stop = @adsl-stop@;
}
Modified: initng/trunk/initfiles/daemon/udhcpc.ii
==============================================================================
--- initng/trunk/initfiles/daemon/udhcpc.ii (original)
+++ initng/trunk/initfiles/daemon/udhcpc.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/udhcpc/* {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
pid_file = /var/run/udhcpc-${NAME}.pid;
respawn;
env_file = /etc/conf.d/net;
Modified: initng/trunk/initfiles/daemon/wdm.ii
==============================================================================
--- initng/trunk/initfiles/daemon/wdm.ii (original)
+++ initng/trunk/initfiles/daemon/wdm.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
daemon daemon/wdm {
need = system/bootmisc;
conflict = daemon/gdm daemon/kdm daemon/xdm;
- use = system/static-modules system/coldplug system/netmount;
+ use = system/modules system/coldplug system/netmount;
exec daemon = @/usr/bin/wdm@ -nodaemon;
}
Modified: initng/trunk/initfiles/daemon/xdm.ii
==============================================================================
--- initng/trunk/initfiles/daemon/xdm.ii (original)
+++ initng/trunk/initfiles/daemon/xdm.ii Sat Mar 4 14:47:40 2006
@@ -1,7 +1,7 @@
daemon daemon/xdm {
need = system/bootmisc;
conflict = daemon/gdm daemon/kdm daemon/wdm;
- use = system/static-modules system/coldplug system/faketty;
+ use = system/modules system/coldplug system/faketty;
exec daemon = @/usr/sbin/xdm:/usr/bin/xdm@ -nodaemon;
# pid_file = /var/run/xdm.pid;
forks;
Modified: initng/trunk/initfiles/debug/buggy.ii
==============================================================================
--- initng/trunk/initfiles/debug/buggy.ii (original)
+++ initng/trunk/initfiles/debug/buggy.ii Sat Mar 4 14:47:40 2006
@@ -12,7 +12,7 @@
service net/* {
need = system/bootmisc;
- use = system/static-modules system/coldplug daemon/cardmgr;
+ use = system/modules system/coldplug daemon/cardmgr;
#ifd debian linspire
need = system/ifupdown-debian;
exec start = /sbin/ifup ${NAME};
@@ -26,7 +26,7 @@
#ifd debian linspire
service net/all {
need = system/bootmisc;
- use = system/static-modules system/coldplug daemon/cardmgr;
+ use = system/modules system/coldplug daemon/cardmgr;
exec start = @/sbin/ifup@ -a;
exec stop = @/sbin/ifdown@ -a;
}
Modified: initng/trunk/initfiles/net/net.ii
==============================================================================
--- initng/trunk/initfiles/net/net.ii (original)
+++ initng/trunk/initfiles/net/net.ii Sat Mar 4 14:47:40 2006
@@ -10,7 +10,7 @@
#ifd pingwinek
network_provider;
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
script start = {
/etc/net/scripts/initconf write
/etc/net/scripts/network.init start
@@ -23,7 +23,7 @@
#endd
#endd
#ifd debian linspire
- use = system/static-modules system/coldplug daemon/cardmgr;
+ use = system/modules system/coldplug daemon/cardmgr;
script start = {
for i in `@cat@ /etc/network/interfaces | @grep@ "^auto " | @awk@ '{ for (i=2; i<=NF; i++) print $i }'`
do
@@ -47,7 +47,7 @@
#elsed
need = system/bootmisc;
#endd
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
#ifd gentoo
exec start = ${INITNG_PLUGIN_DIR}/scripts/net/interface ${NAME} start;
exec stop = ${INITNG_PLUGIN_DIR}/scripts/net/interface ${NAME} stop;
@@ -68,7 +68,7 @@
#elsed
need = system/bootmisc;
#endd
- use = system/static-modules system/coldplug daemon/cardmgr;
+ use = system/modules system/coldplug daemon/cardmgr;
#ifd gentoo
exec start = @/lib/initng@/scripts/net/interface ${NAME} start;
exec stop = @/lib/initng@/scripts/net/interface ${NAME} stop;
Modified: initng/trunk/initfiles/system/Makefile.am
==============================================================================
--- initng/trunk/initfiles/system/Makefile.am (original)
+++ initng/trunk/initfiles/system/Makefile.am Sat Mar 4 14:47:40 2006
@@ -7,9 +7,9 @@
acct.ii \
alsasound.ii \
alsasound-old.ii \
+ anacron.ii \
audit.ii \
aumix.ii \
- anacron.ii \
bootmisc.ii \
checkfs.ii \
clock.ii \
@@ -19,46 +19,44 @@
discover.ii \
dmraid.ii \
domainname.ii \
- dotnet.ii \
faketty.ii \
+ fbsplash.ii \
+ firestarter.ii \
+ guarddog.ii \
hdparm.ii \
hostname.ii \
ifrename.ii \
ifupdown-debian.ii \
initial.ii \
initrd-tools.ii \
+ iptables.ii \
issue.ii \
keymaps.ii \
laptop-mode.ii \
local.ii \
+ lm-sensors.ii \
modules.ii \
mountfs.ii \
mountroot.ii \
netmount.ii \
+ ntpdate.ii \
numlock.ii \
pcmcia.ii \
readahead.ii \
rmnologin.ii \
serial.ii \
speedstep.ii \
- fbsplash.ii \
selinux.ii \
splashy.ii \
sraid.ii \
- static-modules.ii \
swap.ii \
sysctl.ii \
udev.ii \
urandom.ii \
usb.ii \
- ntpdate.ii \
- firestarter.ii \
- guarddog.ii \
- wifi-radar.ii \
- lm-sensors.ii \
usplash.ii \
- xorgconf.ii \
- iptables.ii
+ wifi-radar.ii \
+ xorgconf.ii
EXTRA_DIST = $(iifiles)
Modified: initng/trunk/initfiles/system/alsasound.ii
==============================================================================
--- initng/trunk/initfiles/system/alsasound.ii (original)
+++ initng/trunk/initfiles/system/alsasound.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service system/alsasound/cards {
need = system/bootmisc;
- use = system/coldplug system/static-modules;
+ use = system/coldplug system/modules/depmod system/modules;
script start = {
# List of drivers for each card.
for mod in `@modprobe@ -c | @awk@ '$1 == "alias" && $2 ~ /^snd-card-[[:digit:]]$/ { print $2 } {}'`
@@ -36,7 +36,7 @@
service system/alsasound/oss {
need = system/bootmisc;
- use = system/coldplug system/static-modules;
+ use = system/coldplug system/modules/depmod system/modules;
script start = {
for mod in `@modprobe@ -l | @grep@ "snd.*oss" | @sed@ -e "s:\/.*\/::" -e "s:\..*::"`
do
@@ -55,7 +55,7 @@
service system/alsasound/seq {
need = system/bootmisc;
- use = system/coldplug system/static-modules;
+ use = system/coldplug system/modules/depmod system/modules;
script start = {
# We want to ensure snd-seq is loaded as it is needed for things like
# timidity even if we do not use a real sequencer.
@@ -81,7 +81,7 @@
service system/alsasound/ioctl32 {
need = system/bootmisc;
- use = system/coldplug system/static-modules;
+ use = system/coldplug system/modules/depmod system/modules;
script start = {
# We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
# compatibility
@@ -126,7 +126,7 @@
service system/alsasound {
need = system/bootmisc;
- use = system/coldplug system/alsasound/cards system/static-modules system/alsasound/ioctl32 system/alsasound/seq system/alsasound/oss;
+ use = system/coldplug system/alsasound/cards system/alsasound/ioctl32 system/alsasound/seq system/alsasound/oss system/modules/depmod system/modules;
also_stop = system/alsasound/cards system/alsasound/ioctl32 system/alsasound/seq system/alsasound/oss;
env alsascrdir=/etc/alsa.d;
script start = {
Modified: initng/trunk/initfiles/system/clock.ii
==============================================================================
--- initng/trunk/initfiles/system/clock.ii (original)
+++ initng/trunk/initfiles/system/clock.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service system/clock {
need = system/initial;
- use = system/static-modules;
+ use = system/modules;
#ifd debian linspire
env_file = /etc/default/rcS;
#elsed fedora
Modified: initng/trunk/initfiles/system/coldplug.ii
==============================================================================
--- initng/trunk/initfiles/system/coldplug.ii (original)
+++ initng/trunk/initfiles/system/coldplug.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
container system/coldplug/class {
need = system/initial;
- use = system/static-modules;
+ use = system/modules/depmod system/modules;
exec start = /etc/hotplug/${NAME}.rc start;
exec stop = /etc/hotplug/${NAME}.rc stop;
# don't start two coldplug probes at once (because of the massive bash work in coldplug, static-modules does not have this)
@@ -42,7 +42,7 @@
need = system/bootmisc system/coldplug/pci system/coldplug/usb system/coldplug/isapnp system/coldplug/input system/coldplug/ide system/coldplug/scsi;
also_stop = system/bootmisc system/coldplug/pci system/coldplug/usb system/coldplug/isapnp system/coldplug/input system/coldplug/ide system/coldplug/scsi;
#endd
- use = system/static-modules;
+ use = system/modules/depmod system/modules;
#ifd unknown_system
# this should be done by device-manager
script start = {
Modified: initng/trunk/initfiles/system/lm-sensors.ii
==============================================================================
--- initng/trunk/initfiles/system/lm-sensors.ii (original)
+++ initng/trunk/initfiles/system/lm-sensors.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service system/lm-sensors {
need = system/bootmisc;
- use = system/static-modules;
+ use = system/modules;
stdout = /dev/null;
script start = {
@/usr/bin/sensors@ -s
Modified: initng/trunk/initfiles/system/modules.ii
==============================================================================
--- initng/trunk/initfiles/system/modules.ii (original)
+++ initng/trunk/initfiles/system/modules.ii Sat Mar 4 14:47:40 2006
@@ -1,15 +1,4 @@
-service system/modules/* {
- need = system/initial system/mountroot;
- stdall = /dev/null;
- script start = {
- @modprobe@ ${NAME} || true
- };
- script stop = {
- @modprobe@ -r ${NAME} || true
- };
-}
-
-service system/modules {
+service system/modules/depmod {
need = system/initial system/mountroot;
script start = {
# Should not fail if kernel do not have module
@@ -67,3 +56,41 @@
exit 0
};
}
+
+service system/modules/* {
+ need = system/initial system/mountroot;
+ use = system/modules/depmod;
+ stdall = /dev/null;
+ script start = {
+ @modprobe@ ${NAME} || true
+ };
+ script stop = {
+ @modprobe@ -r ${NAME} || true
+ };
+}
+
+service system/modules {
+ need = system/initial system/mountfs;
+ use = system/modules/depmod;
+ script start = {
+ load_modules() {
+ [ -r "${1}" ] || return 1
+ @grep@ -v "^#" "${1}" | @grep@ -v "^$" | while read MODULE MODARGS
+ do
+ echo "Loading module \"${MODULE}\" ..."
+ @/sbin/modprobe@ -q ${MODULE} ${MODARGS}
+ done
+ }
+ # GENTOO: Don't probe kernel version, initng, requires 2.6 anyway
+ load_modules /etc/modules.autoload.d/kernel-2.6
+ load_modules /etc/modules
+ if [ -n "`@/sbin/modprobe@ -l -t boot \*`" ]
+ then
+ echo "Loading of modules in /lib/modules/boot is broken!"
+ # Don't add -l here - it suppresses the error message,
+ # but it also prevents the modules from being loaded
+ @/sbin/modprobe@ -a -t boot \*
+ fi
+ exit 0 # Bad things happen if we fail
+ };
+}
Modified: initng/trunk/initfiles/system/ntpdate.ii
==============================================================================
--- initng/trunk/initfiles/system/ntpdate.ii (original)
+++ initng/trunk/initfiles/system/ntpdate.ii Sat Mar 4 14:47:40 2006
@@ -4,7 +4,7 @@
#ifd debian
env_file = /etc/default/ntpdate;
#elsed
- env_file = /etc/conf.d/ntp-client;
+ env_file = /etc/conf.d/ntp;
#endd
require_network;
exec start = @/usr/sbin/ntpdate@ -b -s ${NTPOPTIONS} ${NTPSERVERS};
Modified: initng/trunk/initfiles/system/speedstep.ii
==============================================================================
--- initng/trunk/initfiles/system/speedstep.ii (original)
+++ initng/trunk/initfiles/system/speedstep.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service system/speedstep {
need = system/bootmisc system/modules/cpufreq-ondemand system/modules/cpufreq_userspace system/modules/cpufreq_stats system/modules/cpufreq_powersave system/modules/cpufreq_conservative system/modules/speedstep_centrino;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
script start = {
@cat@ /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor >/tmp/origgovanor
echo ondemand >/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
Modified: initng/trunk/initfiles/system/wifi-radar.ii
==============================================================================
--- initng/trunk/initfiles/system/wifi-radar.ii (original)
+++ initng/trunk/initfiles/system/wifi-radar.ii Sat Mar 4 14:47:40 2006
@@ -1,6 +1,6 @@
service system/wifi-radar {
need = system/bootmisc;
- use = system/static-modules system/coldplug;
+ use = system/modules system/coldplug;
exec start = @/usr/sbin/wifi-radar@ -d;
stdall = /var/log/wifi-radar.log;
}
More information about the Initng-svn
mailing list