[Initng-svn] r4369 - init-scripts
svn at initng.thinktux.net
svn at initng.thinktux.net
Tue Jun 6 04:18:31 CEST 2006
Author: jimmy
Date: Tue Jun 6 04:18:29 2006
New Revision: 4369
Modified:
init-scripts/bootmisc
init-scripts/checkfs
init-scripts/clock
init-scripts/default
init-scripts/getty
init-scripts/initial
init-scripts/mountfs
init-scripts/mountroot
init-scripts/udev
Log:
Update, to fit new syntax.
Modified: init-scripts/bootmisc
==============================================================================
--- init-scripts/bootmisc (original)
+++ init-scripts/bootmisc Tue Jun 6 04:18:29 2006
@@ -3,15 +3,15 @@
setup()
{
# register new service type, the $SERVICE will be "example" here.
- iregister service $SERVICE
+ iregister service
- iset $SERVICE need = "initial mountfs"
- iset $SERVICE use = "hdparm swap clock"
+ iset need = "initial mountfs"
+ iset use = "hdparm swap clock"
- iset $SERVICE exec start = "$SERVICE_FILE internal_start"
+ iset exec start = "$SERVICE_FILE internal_start"
# Tell initng this service is done parsing.
- idone $SERVICE
+ idone
}
start()
Modified: init-scripts/checkfs
==============================================================================
--- init-scripts/checkfs (original)
+++ init-scripts/checkfs Tue Jun 6 04:18:29 2006
@@ -5,12 +5,12 @@
setup()
{
- iregister service $SERVICE
- iset $SERVICE need = "initial mountroot"
- iset $SERVICE use = "sraid hdparm"
- iset $SERVICE never_kill
- iset $SERVICE exec start = "$SERVICE_FILE internal_start"
- idone $SERVICE
+ iregister service
+ iset need = "initial mountroot"
+ iset use = "sraid hdparm"
+ iset never_kill
+ iset exec start = "$SERVICE_FILE internal_start"
+ idone
}
start()
Modified: init-scripts/clock
==============================================================================
--- init-scripts/clock (original)
+++ init-scripts/clock Tue Jun 6 04:18:29 2006
@@ -4,18 +4,18 @@
setup()
{
- # register new service type, the $SERVICE will be "example" here.
- iregister service $SERVICE
+ # register new service type, the will be "example" here.
+ iregister service
- iset $SERVICE need = initial
- iset $SERVICE use = modules
+ iset need = initial
+ iset use = modules
# These 2 lines will be macro defined in the future.
- iset $SERVICE exec start = "$SERVICE_FILE internal_start"
- iset $SERVICE exec stop = "$SERVICE_FILE internal_stop"
+ iset exec start = "$SERVICE_FILE internal_start"
+ iset exec stop = "$SERVICE_FILE internal_stop"
# Tell initng this service is done parsing.
- idone $SERVICE
+ idone
}
start()
Modified: init-scripts/default
==============================================================================
--- init-scripts/default (original)
+++ init-scripts/default Tue Jun 6 04:18:29 2006
@@ -2,7 +2,7 @@
setup()
{
- iregister runlevel $SERVICE
- iset $SERVICE need = "clock getty initial udev"
- idone $SERVICE
+ iregister runlevel
+ iset need = "clock getty initial udev"
+ idone
}
Modified: init-scripts/getty
==============================================================================
--- init-scripts/getty (original)
+++ init-scripts/getty Tue Jun 6 04:18:29 2006
@@ -2,18 +2,18 @@
setup()
{
- iregister virtual getty
+ iregister -s getty virtual
for $SE in 1 2 3 4 5 6
do
- iregister daemon getty/$SE
- iset getty/$SE need = initial bootmisc
- iset getty/$SE term_timeout = 3
- iset getty/$SE exec daemon = /sbin/getty 38400 tty${SE}
- iset getty/$SE respawn
- idone getty/$SE
- iset getty need = getty/$SE
+ iregister -s getty/$SE daemon
+ iset -s getty/$SE need = initial bootmisc
+ iset -s getty/$SE term_timeout = 3
+ iset -s getty/$SE exec daemon = /sbin/getty 38400 tty${SE}
+ iset -s getty/$SE respawn
+ idone -s getty/$SE
+ iset -s getty need = getty/$SE
done
- idone getty
+ idone -s getty
}
Modified: init-scripts/initial
==============================================================================
--- init-scripts/initial (original)
+++ init-scripts/initial Tue Jun 6 04:18:29 2006
@@ -3,34 +3,34 @@
setup()
{
# Register all services.
- iregister service initial/mountvirtfs
- iregister service initial/filldev
- iregister service initial/loglevel
- iregister virtual initial
+ iregister -s initial/mountvirtfs service
+ iregister -s initial/filldev service
+ iregister -s initial/loglevel service
+ iregister virtual
# Mark them critical
- iset initial/mountvirtfs critical
- iset initial/filldev critical
+ iset -s initial/mountvirtfs critical
+ iset -s initial/filldev critical
# Set up deps
- iset initial/filldev need = initial/mountvirtfs
- iset initial/filldev use = udev/mountdev
- iset initial need = "initial/loglevel initial/mountvirtfs initial/filldev"
- iset initial use = "selinux/dev udev"
+ iset -s initial/filldev need = initial/mountvirtfs
+ iset -s initial/filldev use = udev/mountdev
+ iset need = "initial/loglevel initial/mountvirtfs initial/filldev"
+ iset use = "selinux/dev udev"
# Set run locations in this script
- iset initial/mountvirtfs exec start = "$SERVICE_FILE internal_mountvirtfs_start"
- iset initial/filldev exec start = "$SERVICE_FILE internal_filldev_start"
+ iset -s initial/mountvirtfs exec start = "$SERVICE_FILE internal_mountvirtfs_start"
+ iset -s initial/filldev exec start = "$SERVICE_FILE internal_filldev_start"
# Local executes, not needing scripts
- iset initial/loglevel exec start = /bin/dmesg -n 1;
- iset initial/loglevel exec stop = /bin/dmesg -n 2;
+ iset -s initial/loglevel exec start = /bin/dmesg -n 1;
+ iset -s initial/loglevel exec stop = /bin/dmesg -n 2;
# Tell initng this service is done parsing.
- idone initial/mountvirtfs
- idone initial/filldev
- idone initial/loglevel
- idone initial
+ idone -s initial/mountvirtfs
+ idone -s initial/filldev
+ idone -s initial/loglevel
+ idone
}
mountvirtfs_start()
Modified: init-scripts/mountfs
==============================================================================
--- init-scripts/mountfs (original)
+++ init-scripts/mountfs Tue Jun 6 04:18:29 2006
@@ -2,17 +2,16 @@
setup()
{
- # register new service type, the $SERVICE will be "example" here.
- iregister service $SERVICE
- iset $SERVICE critical
- iset $SERVICE need = "initial mountroot checkfs"
- iset $SERVICE use = "sraid hdparm selinux/relabel"
+ iregister service
+ iset critical
+ iset need = "initial mountroot checkfs"
+ iset use = "sraid hdparm selinux/relabel"
- iset $SERVICE exec start = "$SERVICE_FILE internal_start"
- iset $SERVICE exec stop = "$SERVICE_FILE internal_stop"
+ iset exec start = "$SERVICE_FILE internal_start"
+ iset exec stop = "$SERVICE_FILE internal_stop"
# Tell initng this service is done parsing.
- idone $SERVICE
+ idone
}
start()
Modified: init-scripts/mountroot
==============================================================================
--- init-scripts/mountroot (original)
+++ init-scripts/mountroot Tue Jun 6 04:18:29 2006
@@ -5,47 +5,47 @@
setup()
{
- iregister service mountroot
- iregister service mountroot/check
- iregister service mountroot/rootrw
+ iregister service
+ iregister -s mountroot/check service
+ iregister -s mountroot/rootrw service
# TODO, only register these if os have them
- iregister service mountroot/dmsetup
- iregister service mountroot/lvm
- iregister service mountroot/evms
+ iregister -s mountroot/dmsetup service
+ iregister -s mountroot/lvm service
+ iregister -s mountroot/evms service
- iset mountroot/dmsetup need = "initial modules/dm-mod"
- iset mountroot/lvm need = "initial modules/lvm modules/lvm-mod mountroot/dmsetup"
- iset mountroot/evms need = "initial"
- iset mountroot/check need = "initial"
- iset mountroot/check use = "mountroot/evms mountroot/lvm mountroot/dmsetup"
- iset mountroot/rootrw need = "initial mountroot/check"
- iset mountroot/rootrw use = "mountroot/evms mountroot/lvm mountroot/dmsetup"
- iset mountroot need = "initial mountroot/rootrw"
+ iset -s mountroot/dmsetup need = "initial modules/dm-mod"
+ iset -s mountroot/lvm need = "initial modules/lvm modules/lvm-mod mountroot/dmsetup"
+ iset -s mountroot/evms need = "initial"
+ iset -s mountroot/check need = "initial"
+ iset -s mountroot/check use = "mountroot/evms mountroot/lvm mountroot/dmsetup"
+ iset -s mountroot/rootrw need = "initial mountroot/check"
+ iset -s mountroot/rootrw use = "mountroot/evms mountroot/lvm mountroot/dmsetup"
+ iset need = "initial mountroot/rootrw"
# mountroot/check cant fail!
- iset mountroot/check critical
- iset mountroot/check never_kill
- iset mountroot/rootrw critical
- iset mountroot/rootrw never_kill
+ iset -s mountroot/check critical
+ iset -s mountroot/check never_kill
+ iset -s mountroot/rootrw critical
+ iset -s mountroot/rootrw never_kill
# execute targets:
- iset mountroot/dmsetup exec start = "/sbin/dmsetup mknodes"
- iset mountroot/lvm exec start = "$SERVICE_FILE internal_lvm_start"
- iset mountroot/evms exec start = "/sbin/evms_activate"
- iset mountroot/check exec start = "$SERVICE_FILE internal_check_start"
- iset mountroot/rootrw exec start = "$SERVICE_FILE internal_rootrw_start"
- iset mountroot/rootrw exec stop = "$SERVICE_FILE internal_rootrw_stop"
- iset mountroot exec start = "$SERVICE_FILE internal_mountroot_start"
+ iset -s mountroot/dmsetup exec start = "/sbin/dmsetup mknodes"
+ iset -s mountroot/lvm exec start = "$SERVICE_FILE internal_lvm_start"
+ iset -s mountroot/evms exec start = "/sbin/evms_activate"
+ iset -s mountroot/check exec start = "$SERVICE_FILE internal_check_start"
+ iset -s mountroot/rootrw exec start = "$SERVICE_FILE internal_rootrw_start"
+ iset -s mountroot/rootrw exec stop = "$SERVICE_FILE internal_rootrw_stop"
+ iset exec start = "$SERVICE_FILE internal_mountroot_start"
# Tell initng this service is done parsing.
- idone mountroot/dmsetup
- idone mountroot/lvm
- idone mountroot/evms
- idone mountroot/check
- idone mountroot/rootrw
- idone mountroot
+ idone -s mountroot/dmsetup
+ idone -s mountroot/lvm
+ idone -s mountroot/evms
+ idone -s mountroot/check
+ idone -s mountroot/rootrw
+ idone
}
lvm_start()
Modified: init-scripts/udev
==============================================================================
--- init-scripts/udev (original)
+++ init-scripts/udev Tue Jun 6 04:18:29 2006
@@ -2,44 +2,44 @@
setup()
{
- iregister virtual udev
- iregister daemon udev/udevd
- iregister service udev/mountdev
- iregister service udev/set_hotplug
- iregister service udev/filldev
+ iregister virtual
+ iregister -s udev/udevd daemon
+ iregister -s udev/mountdev service
+ iregister -s udev/set_hotplug service
+ iregister -s udev/filldev service
# Set the deps
- iset udev need = "udev/filldev udev/udevd udev/set_hotplug"
- iset udev/udevd need = "udev/mountdev initial/mountvirtfs"
- iset udev/mountdev need = initial/mountvirtfs
- iset udev/set_hotplug need = "udev/udevd initial/mountvirtfs"
- iset udev/filldev need = "udev/udevd"
+ iset need = "udev/filldev udev/udevd udev/set_hotplug"
+ iset -s udev/udevd need = "udev/mountdev initial/mountvirtfs"
+ iset -s udev/mountdev need = initial/mountvirtfs
+ iset -s udev/set_hotplug need = "udev/udevd initial/mountvirtfs"
+ iset -s udev/filldev need = "udev/udevd"
# Set criticals
- iset udev/udevd critical
- iset udev/mountdev cricital
- iset udev/set_hotplug critical
- iset udev/filldev critical
+ iset -s udev/udevd critical
+ iset -s udev/mountdev cricital
+ iset -s udev/set_hotplug critical
+ iset -s udev/filldev critical
# Set up udevd daemon
- iset udev/udevd respawn
- iset udev/udevd pid_of = "udevd"
- iset udev/udevd forks;
- iset udev/udevd exec daemon = "/sbin/udevd --daemon"
+ iset -s udev/udevd respawn
+ iset -s udev/udevd pid_of = "udevd"
+ iset -s udev/udevd forks;
+ iset -s udev/udevd exec daemon = "/sbin/udevd --daemon"
# Add execution in this local script
- iset udev/mountdev exec start = "$SERVICE_FILE internal_mountdev_start"
- iset udev/set_hotplug exec start = "$SERVICE_FILE internal_set_hotplug_start"
- iset udev/set_hotplug exec stop = "$SERVICE_FILE internal_set_hotplug_stop"
- iset udev/fill_udev exec start = "$SERVICE_FILE internal_fill_udev_start"
+ iset -s udev/mountdev exec start = "$SERVICE_FILE internal_mountdev_start"
+ iset -s udev/set_hotplug exec start = "$SERVICE_FILE internal_set_hotplug_start"
+ iset -s udev/set_hotplug exec stop = "$SERVICE_FILE internal_set_hotplug_stop"
+ iset -s udev/fill_udev exec start = "$SERVICE_FILE internal_fill_udev_start"
# Tell initng this service is done parsing.
- idone udev
- idone udev/udevd
- idone udev/mountdev
- idone udev/set_hotplug
- idone udev/filldev
+ idone
+ idone -s udev/udevd
+ idone -s udev/mountdev
+ idone -s udev/set_hotplug
+ idone -s udev/filldev
}
mountdev_start()
More information about the Initng-svn
mailing list