X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FMakeInitrd.py;h=0ba815c2c76c6866d691871dff7d88d2b527e4ed;hb=301b70f93100d8775e034e7c2afe59660f7e3870;hp=a98c8f05f10a00a3b70cf2f6cfe7acaa848d99c5;hpb=0badb83836184e9883bd25a62c8f918cdf936544;p=bootmanager.git

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index a98c8f0..0ba815c 100644
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -6,6 +6,8 @@
 # Copyright (c) 2004-2006 The Trustees of Princeton University
 # All rights reserved.
 
+from __future__ import print_function
+
 import os
 
 from Exceptions import *
@@ -17,38 +19,42 @@ import systeminfo
 # http://kbase.redhat.com/faq/docs/DOC-16528;jsessionid=7E984A99DE8DB094D9FB08181C71717C.ab46478d
 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 , log )
-            utils.sysexec_noerr('chmod 755 %s/etc/sysconfig/mkinitrd/noraid' % sysimg_path, log )
+            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
@@ -57,20 +63,22 @@ def Run( vars, log ):
     # 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 %s/dev" % SYSIMG_PATH)
-    utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
+    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)
+        print("{}/boot/{} is already removed".format(SYSIMG_PATH, initrd))
 
     # hack for CentOS 5.3
-    bypassRaidIfNeeded(SYSIMG_PATH , log )
-    utils.sysexec_chroot( SYSIMG_PATH, "mkinitrd -v --allow-missing /boot/initrd-%s.img %s" % \
-               (kernel_version, kernel_version), log )
+    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 , log )
-    utils.sysexec_noerr("umount %s/dev" % SYSIMG_PATH , log)
+    utils.sysexec_noerr("umount {}/sys".format(SYSIMG_PATH), log)
+    utils.sysexec_noerr("umount {}/dev".format(SYSIMG_PATH), log)