git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync sys clock to hardware to prevent fsck reboot bug for systems with wrong
[bootmanager.git]
/
source
/
steps
/
ChainBootNode.py
diff --git
a/source/steps/ChainBootNode.py
b/source/steps/ChainBootNode.py
index
2e7a5da
..
6d1e39e
100644
(file)
--- a/
source/steps/ChainBootNode.py
+++ b/
source/steps/ChainBootNode.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
2
+#!/usr/bin/python
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
@@
-12,9
+12,9
@@
import re
import os
import UpdateBootStateWithPLC
import os
import UpdateBootStateWithPLC
+import UpdateNodeConfiguration
from Exceptions import *
import utils
from Exceptions import *
import utils
-import compatibility
import systeminfo
import BootAPI
import notify_messages
import systeminfo
import BootAPI
import notify_messages
@@
-30,7
+30,6
@@
def Run( vars, log ):
booting has occurred.
Expect the following variables:
booting has occurred.
Expect the following variables:
- BOOT_CD_VERSION A tuple of the current bootcd version
SYSIMG_PATH the path where the system image will be mounted
(always starts with TEMP_PATH)
ROOT_MOUNTED the node root file system is mounted
SYSIMG_PATH the path where the system image will be mounted
(always starts with TEMP_PATH)
ROOT_MOUNTED the node root file system is mounted
@@
-46,10
+45,6
@@
def Run( vars, log ):
# make sure we have the variables we need
try:
# make sure we have the variables we need
try:
- BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
- if BOOT_CD_VERSION == "":
- raise ValueError, "BOOT_CD_VERSION"
-
SYSIMG_PATH= vars["SYSIMG_PATH"]
if SYSIMG_PATH == "":
raise ValueError, "SYSIMG_PATH"
SYSIMG_PATH= vars["SYSIMG_PATH"]
if SYSIMG_PATH == "":
raise ValueError, "SYSIMG_PATH"
@@
-73,16
+68,12
@@
def Run( vars, log ):
raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
ROOT_MOUNTED= 0
raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
ROOT_MOUNTED= 0
- if
'ROOT_MOUNTED' in vars.keys(
):
+ if
vars.has_key('ROOT_MOUNTED'
):
ROOT_MOUNTED= vars['ROOT_MOUNTED']
if ROOT_MOUNTED == 0:
log.write( "Mounting node partitions\n" )
ROOT_MOUNTED= vars['ROOT_MOUNTED']
if ROOT_MOUNTED == 0:
log.write( "Mounting node partitions\n" )
- # old cds need extra utilities to run lvm
- if BOOT_CD_VERSION[0] == 2:
- compatibility.setup_lvm_2x_cd( vars, log )
-
# simply creating an instance of this class and listing the system
# block devices will make them show up so vgscan can find the planetlab
# volume group
# simply creating an instance of this class and listing the system
# block devices will make them show up so vgscan can find the planetlab
# volume group
@@
-132,6
+123,9
@@
def Run( vars, log ):
cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
utils.sysexec( cmd, log )
cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
utils.sysexec( cmd, log )
+ # the following step should be done by NM
+ UpdateNodeConfiguration.Run( vars, log )
+
log.write( "Updating ssh public host key with PLC.\n" )
ssh_host_key= ""
try:
log.write( "Updating ssh public host key with PLC.\n" )
ssh_host_key= ""
try:
@@
-190,25
+184,25
@@
def Run( vars, log ):
utils.sysexec_noerr( "ifconfig eth0 down", log )
utils.sysexec_noerr( "ifconfig eth0 down", log )
- if BOOT_CD_VERSION[0] == 2:
- utils.sysexec_noerr( "killall dhcpcd", log )
- elif BOOT_CD_VERSION[0] >= 3:
- utils.sysexec_noerr( "killall dhclient", log )
+ utils.sysexec_noerr( "killall dhclient", log )
utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log )
utils.sysexec_noerr( "modprobe -r lvm-mod", log )
utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log )
utils.sysexec_noerr( "modprobe -r lvm-mod", log )
+ # modules that should not get unloaded
+ # unloading cpqphp causes a kernel panic
+ blacklist = [ "floppy", "cpqphp", "i82875p_edac", "mptspi"]
try:
modules= file("/tmp/loadedmodules","r")
for line in modules:
module= string.strip(line)
try:
modules= file("/tmp/loadedmodules","r")
for line in modules:
module= string.strip(line)
- if module
== "floppy"
:
- log.write("Skipping unload of
floppy kernel module.\n"
)
+ if module
in blacklist
:
+ log.write("Skipping unload of
kernel module '%s'.\n"%module
)
elif module != "":
log.write( "Unloading %s\n" % module )
utils.sysexec_noerr( "modprobe -r %s" % module, log )
elif module != "":
log.write( "Unloading %s\n" % module )
utils.sysexec_noerr( "modprobe -r %s" % module, log )
- if
module == "e1000"
:
+ if
"e1000" in module
:
log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
time.sleep(4)
log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
time.sleep(4)
@@
-272,6
+266,7
@@
def Run( vars, log ):
# kargs, which is ramdisk_size=8192
pass
# kargs, which is ramdisk_size=8192
pass
+ utils.sysexec_noerr( 'hwclock --systohc --utc ' )
utils.breakpoint ("Before kexec");
try:
utils.sysexec( 'kexec --force --initrd=/tmp/initrd ' \
utils.breakpoint ("Before kexec");
try:
utils.sysexec( 'kexec --force --initrd=/tmp/initrd ' \