X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FMakeInitrd.py;h=f6f2d038af39bbf274f520ef13ec38da33c3daff;hb=d531cfaf5185ca1e74a5f15c2e3b1254968200de;hp=bf1ba95a04e8bfd12901f9beec7ecac04b4a9a25;hpb=f319a8525c96631ec3e679994fc7cea5c935a209;p=bootmanager.git

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index bf1ba95..f6f2d03 100644
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -1,87 +1,84 @@
 #!/usr/bin/python
-
+#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
 # Copyright (c) 2004-2006 The Trustees of Princeton University
 # All rights reserved.
 
-import os, string
+from __future__ import print_function
+
+import os
 
 from Exceptions import *
 import utils
 import systeminfo
-import shutil
-
-def kernelHasMkinitrd():
-    #  Older bootcds only support LinuxThreads.  This hack is to get mkinitrd
-    #  to run without segfaulting by using /lib/obsolete/linuxthreads
-    kver = os.popen("/bin/uname -r", "r").readlines()[0].rstrip().split(".")
-    if int(kver[1]) > 4:
-        return True
-    elif int(kver[1]) <=4:
-        return False
-
 
 # for centos5.3
 # 14:42:27(UTC) No module dm-mem-cache found for kernel 2.6.22.19-vs2.3.0.34.33.onelab, aborting.
 # http://kbase.redhat.com/faq/docs/DOC-16528;jsessionid=7E984A99DE8DB094D9FB08181C71717C.ab46478d
-def bypassRaidIfNeeded(sysimg_path):
+def bypassRaidIfNeeded(sysimg_path, log):
     try:
-        [ a,b,c,d]=file('%s/etc/redhat-release'%sysimg_path).readlines()[0].strip().split()
-        if a !='CentOS': return
-        [major,minor]=[int(x) for x in c.split('.')]
+        a, b, c, d = file('{}/etc/redhat-release'.format(sysimg_path))\
+            .readlines()[0].strip().split()
+        if a != 'CentOS':
+            return
+        major, minor = [ int(x) for x in c.split('.') ]
         if minor >= 3:
-            utils.sysexec_noerr('echo "DMRAID=no" >> %s/etc/sysconfig/mkinitrd/noraid' % sysimg_path)
-            utils.sysexec_noerr('chmod 755 %s/etc/sysconfig/mkinitrd/noraid' % sysimg_path)
+            utils.sysexec_noerr('echo "DMRAID=no" >> {}/etc/sysconfig/mkinitrd/noraid'
+                                .format(sysimg_path), log)
+            utils.sysexec_noerr('chmod 755 {}/etc/sysconfig/mkinitrd/noraid'
+                                .format(sysimg_path), log)
     except:
         pass
             
         
-def Run( vars, log ):
+def Run(vars, log):
     """
     Rebuilds the system initrd, on first install or in case the
     hardware changed.
     """
 
-    log.write( "\n\nStep: Rebuilding initrd\n" )
+    log.write("\n\nStep: Rebuilding initrd\n")
     
     # make sure we have the variables we need
     try:
-        SYSIMG_PATH= vars["SYSIMG_PATH"]
+        SYSIMG_PATH = vars["SYSIMG_PATH"]
         if SYSIMG_PATH == "":
-            raise ValueError, "SYSIMG_PATH"
+            raise ValueError("SYSIMG_PATH")
 
-        PARTITIONS= vars["PARTITIONS"]
+        PARTITIONS = vars["PARTITIONS"]
         if PARTITIONS == None:
-            raise ValueError, "PARTITIONS"
+            raise ValueError("PARTITIONS")
 
-    except KeyError, var:
-        raise BootManagerException, "Missing variable in vars: %s\n" % var
-    except ValueError, var:
-        raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
+    except KeyError as var:
+        raise BootManagerException("Missing variable in vars: {}\n".format(var))
+    except ValueError as var:
+        raise BootManagerException("Variable in vars, shouldn't be: {}\n".format(var))
 
     # mkinitrd needs /dev and /proc to do the right thing.
     # /proc is already mounted, so bind-mount /dev here
-    utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
-    utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
+    # xxx tmp - trying to work around the f14 case:
+    # check that /dev/ is mounted with devtmpfs
+    # tmp - sysexec_noerr not returning what one would expect
+    # if utils.sysexec_noerr ("grep devtmpfs /proc/mounts") != 0:
+    utils.sysexec_noerr("mount -t devtmpfs none /dev")
+    utils.sysexec("mount -o bind /dev {}/dev".format(SYSIMG_PATH))
+    utils.sysexec("mount -t sysfs none {}/sys".format(SYSIMG_PATH))
 
-    initrd, kernel_version= systeminfo.getKernelVersion(vars,log)
+    initrd, kernel_version = systeminfo.getKernelVersion(vars,log)
     try:
-        utils.removefile( "%s/boot/%s" % (SYSIMG_PATH, initrd) )
+        utils.removefile("{}/boot/{}".format(SYSIMG_PATH, initrd))
     except:
-        print "%s/boot/%s is already removed" % (SYSIMG_PATH, initrd) )
+        log.write("{}/boot/{} is already removed\n".format(SYSIMG_PATH, initrd))
 
     # hack for CentOS 5.3
-    bypassRaidIfNeeded(SYSIMG_PATH)
-    if kernelHasMkinitrd() == True:
-        utils.sysexec_chroot( SYSIMG_PATH, "mkinitrd -v /boot/initrd-%s.img %s" % \
-                   (kernel_version, kernel_version), log )
-    else:
-        shutil.copy("./mkinitrd.sh","%s/tmp/mkinitrd.sh" % SYSIMG_PATH)
-        os.chmod("%s/tmp/mkinitrd.sh" % SYSIMG_PATH, 755)
-        utils.sysexec_chroot( SYSIMG_PATH, "/tmp/mkinitrd.sh %s" % (kernel_version))
+    bypassRaidIfNeeded(SYSIMG_PATH , log)
+    # specify ext3 for fedora14 and above as their default fs is ext4
+    utils.sysexec_chroot(SYSIMG_PATH,
+                         "mkinitrd -v --with=ext3 --allow-missing /boot/initrd-{}.img {}"
+                         .format(kernel_version, kernel_version), log)
 
-    utils.sysexec_noerr("umount %s/sys" % SYSIMG_PATH)
-    utils.sysexec_noerr("umount %s/dev" % SYSIMG_PATH)
+    utils.sysexec_noerr("umount {}/sys".format(SYSIMG_PATH), log)
+    utils.sysexec_noerr("umount {}/dev".format(SYSIMG_PATH), log)