Author: pebender
Date: Mon May 11 17:08:33 2009
New Revision: 4745
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
Log:
- Moved DHCP override and DHCP start so that they done just after running
minimyth.pm
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon May 11
17:08:33 2009
@@ -25,9 +25,11 @@
conveying the state of init between running programs.
- Changed init/dhcp.pm and init/conf/MM_DHCP so that the use the init
state directoy.
+ - Moved DHCP override and DHCP start so that they done just after
running
+ minimyth.pm
- Moved init/modules_automatic.pm so that it starts later in the init
process.
- - Now init/modules_automatic.pm is called after minimyth.pm is
- fetched.
+ - Now init/modules_automatic.pm so that it is called just after
+ starting DHCP.
- Now users can more easily modify kernel module parameters by
adding/removing/modifying files in /etc/modprobe.conf
- Now that the drivers required to boot are compiled into the
kernel
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm
Mon May 11 17:08:33 2009
@@ -133,6 +133,44 @@
}
}
+ # Process the DHCP override configuration variables
+ # so that they are available to the DHCP client.
+ $self->_run($minimyth, 'MM_DHCP_.*') || ($success = 0);
+ $minimyth->var_save({ 'file' => '/etc/conf.d/dhcp.override', 'filter'
=> 'MM_DHCP_.*' });
+
+ if
(open(FILE, '>', '/var/cache/minimyth/init/state/conf/done-dhcp_override_file'))
+ {
+ close(FILE);
+ }
+ else
+ {
+ $success = 0;
+ }
+
+ # Start the DHCP client now that we have created the DHCP override
variables file.
+ $minimyth->package_require(q(init::dhcp));
+ if ($minimyth->package_member_require(q(init::dhcp), q(start)))
+ {
+ eval
+ {
+ init::dhcp->start($minimyth) || ($success = 0);
+ };
+ if ($@)
+ {
+ $minimyth->message_output('err', qq($@));
+ $success = 0;
+ }
+ }
+
+ if (open(FILE, '>', '/var/cache/minimyth/init/state/conf/done-dhcp'))
+ {
+ close(FILE);
+ }
+ else
+ {
+ $success = 0;
+ }
+
# Load the automatic kernel modules.
$minimyth->package_require(q(init::modules_automatic));
if ($minimyth->package_member_require(q(init::modules_automatic),
q(start)))
@@ -188,44 +226,6 @@
# This will load potentially firmware dependent drivers as well.
system(qq(/sbin/udevadm trigger));
system(qq(/sbin/udevadm settle --timeout=60));
-
- # Process the DHCP override configuration variables
- # so that they are available to the DHCP client.
- $self->_run($minimyth, 'MM_DHCP_.*') || ($success = 0);
- $minimyth->var_save({ 'file' => '/etc/conf.d/dhcp.override', 'filter'
=> 'MM_DHCP_.*' });
-
- if
(open(FILE, '>', '/var/cache/minimyth/init/state/conf/done-dhcp_override_file'))
- {
- close(FILE);
- }
- else
- {
- $success = 0;
- }
-
- # Start the DHCP client now that we have created the DHCP override
variables file.
- $minimyth->package_require(q(init::dhcp));
- if ($minimyth->package_member_require(q(init::dhcp), q(start)))
- {
- eval
- {
- init::dhcp->start($minimyth) || ($success = 0);
- };
- if ($@)
- {
- $minimyth->message_output('err', qq($@));
- $success = 0;
- }
- }
-
- if (open(FILE, '>', '/var/cache/minimyth/init/state/conf/done-dhcp'))
- {
- close(FILE);
- }
- else
- {
- $success = 0;
- }
$minimyth->message_output('info', "processing configuration file ...");
$minimyth->var_clear();
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
