[Initng-svn] r4377 - init-scripts

[svn at initng.thinktux.net]

Author: jimmy
Date: Wed Jun  7 02:14:19 2006
New Revision: 4377

Modified:
   init-scripts/bootmisc
   init-scripts/checkfs
   init-scripts/clock
   init-scripts/getty
   init-scripts/initial
   init-scripts/mountfs
   init-scripts/mountroot
   init-scripts/udev

Log:
Small update to scripts.


Modified: init-scripts/bootmisc
==============================================================================
--- init-scripts/bootmisc	(original)
+++ init-scripts/bootmisc	Wed Jun  7 02:14:19 2006
@@ -7,8 +7,8 @@
 
     iset need = "initial mountfs"
 	iset use = "hdparm swap clock"
-	
-	iset exec start = "$SERVICE_FILE internal_start"
+
+	iexec start	
 	
 	# Tell initng this service is done parsing.
     idone

Modified: init-scripts/checkfs
==============================================================================
--- init-scripts/checkfs	(original)
+++ init-scripts/checkfs	Wed Jun  7 02:14:19 2006
@@ -9,7 +9,7 @@
 	iset need = "initial mountroot"
 	iset use = "sraid hdparm"
 	iset never_kill
-	iset exec start = "$SERVICE_FILE internal_start"
+	iexec start
     idone
 }
 

Modified: init-scripts/clock
==============================================================================
--- init-scripts/clock	(original)
+++ init-scripts/clock	Wed Jun  7 02:14:19 2006
@@ -10,10 +10,10 @@
     iset need = initial
 	iset use = modules
 	
-	# These 2 lines will be macro defined in the future.
-	iset exec start = "$SERVICE_FILE internal_start"
-	iset exec stop = "$SERVICE_FILE internal_stop"
-	
+	# Call functions in this script.
+	iexec start
+	iexec stop
+		
 	# Tell initng this service is done parsing.
     idone
 }

Modified: init-scripts/getty
==============================================================================
--- init-scripts/getty	(original)
+++ init-scripts/getty	Wed Jun  7 02:14:19 2006
@@ -15,5 +15,5 @@
 		iset -s getty need = getty/$SE
 	done
 	
-	idone -s getty
+	idone
 }

Modified: init-scripts/initial
==============================================================================
--- init-scripts/initial	(original)
+++ init-scripts/initial	Wed Jun  7 02:14:19 2006
@@ -19,8 +19,8 @@
 	iset use = "selinux/dev udev"
 	
  	# Set run locations in this script
-	iset -s initial/mountvirtfs exec start = "$SERVICE_FILE internal_mountvirtfs_start"
-	iset -s initial/filldev exec start = "$SERVICE_FILE internal_filldev_start"
+	iexec -s initial/mountvirtfs start = mountvirtfs_start
+	iexec -s initial/filldev start = filldev_start
 
 	# Local executes, not needing scripts
 	iset -s initial/loglevel exec start = "/bin/dmesg -n 1"

Modified: init-scripts/mountfs
==============================================================================
--- init-scripts/mountfs	(original)
+++ init-scripts/mountfs	Wed Jun  7 02:14:19 2006
@@ -7,9 +7,9 @@
 	iset need = "initial mountroot checkfs"
 	iset use = "sraid hdparm selinux/relabel"
 	
-	iset exec start = "$SERVICE_FILE internal_start"
-	iset exec stop = "$SERVICE_FILE internal_stop"
-	
+	iexec start
+	iexec stop
+		
 	# Tell initng this service is done parsing.
     idone
 }

Modified: init-scripts/mountroot
==============================================================================
--- init-scripts/mountroot	(original)
+++ init-scripts/mountroot	Wed Jun  7 02:14:19 2006
@@ -32,12 +32,12 @@
 
 	# execute targets:
 	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"
+	iexec -s mountroot/lvm start = lvm_start
+	iexec -s mountroot/check start = check_start
+	iexec -s mountroot/rootrw start = rootrw_start
+	iexec -s mountroot/rootrw stop = rootrw_stop
+	iexec start mountroot_start
 	
 	# Tell initng this service is done parsing.
     idone -s mountroot/dmsetup

Modified: init-scripts/udev
==============================================================================
--- init-scripts/udev	(original)
+++ init-scripts/udev	Wed Jun  7 02:14:19 2006
@@ -29,10 +29,10 @@
 	
 	
 	# Add execution in this local script
-	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"
+	iexec -s udev/mountdev start = mountdev_start
+	iexec -s udev/set_hotplug start = set_hotplug_start
+	iexec -s udev/set_hotplug stop = hotplug_stop
+	iexec -s udev/filldev start = fill_udev_start
 	
 	# Tell initng this service is done parsing.
     idone