Merge lp:~niedbalski/ubuntu/vivid/curtin/fix-1263181 into lp:ubuntu/vivid/curtin

[Jorge Niedbalski]

Fixes LP bug: #1263181

[Scott Moser (smoser)]

Jorge,
I'm really sorry this has taken so long to get to.
I'd appreciate you testing with the branch I pushed to lp:~smoser/ubuntu/vivid/curtin/fix-1263181 .
It has a small change, see the comment in the commit for the issue it (untested, but attempts to resolve).

We need to figure out how to reliably do all this stuff, addressing inconsistently named devices via more reliable mechanisms.

That said, i'm willing to take this if you test my branch there, and then add a function to helpers/common to reduce your 3 checks to use that.

Maybe something like:

path_for_existing_partition() {
    local blockdev="$1" partno="$2"
    for p in "${blockdev}$partno" "${blockdev}p${partno}"; do
        [ -b "$p" ] && _RET="$p" && return 0
    done
    return 1
}

then:
path_for_existing_partition "$target" 1 ||
   { error "no partition found for part 1 on $target"; return 1; }

Also, please update to address the check for partition 15 also.
[ -b "${target}1" ]

[Scott Moser (smoser)]

I'll be back in on tuesday morning and will try to take a further look at this then.
Again, I'm sorry i've not had time to get to this earlier.

[Firl (celpa-firl)]

Any directions for me to be able to test this? I have a DL 380 with 2 drives that I am trying to use for MaaS and it is showing up in lshw as a cciss device

[Scott Moser (smoser)]

the fix should be in wily.
you can just install the curtin debs from wily.
download from https://launchpad.net/ubuntu/+source/curtin manually , and then install.
you probably need curtin-common and python-curtin.

[Sebastien Bacher (seb128)]

seems like that was fixed in wily/vivid
https://launchpad.net/ubuntu/+source/curtin/0.1.0~bzr221-0ubuntu1~14.10.1

=== modified file 'curtin/block/__init__.py'
--- curtin/block/__init__.py	2014-10-27 12:25:27 +0000
+++ curtin/block/__init__.py	2015-02-18 16:18:41 +0000
@@ -25,7 +25,7 @@
 
 
 def get_dev_name_entry(devname):
-    bname = os.path.basename(devname)
+    bname = devname.split('/dev/')[-1]
     return (bname, "/dev/" + bname)
 
 
@@ -62,12 +62,15 @@
             'TYPE', 'UUID']
     if args is None:
         args = []
+    args = [x.replace('!', '/') for x in args]
+
     # in order to avoid a very odd error with '-o' and all output fields above
     # we just drop one.  doesn't really matter which one.
     keys.remove('SCHED')
     basecmd = ['lsblk', '--noheadings', '--bytes', '--pairs',
                '--output=' + ','.join(keys)]
     (out, _err) = util.subp(basecmd + list(args), capture=True)
+    out = out.replace('!', '/')
     return _lsblock_pairs_to_dict(out)
 
 
@@ -134,7 +137,10 @@
     syspath = "/sys/class/block/%s" % bname
 
     if not os.path.exists(syspath):
-        raise ValueError("%s had no syspath (%s)" % (devpath, syspath))
+        syspath2 = "/sys/class/block/cciss!%s" % bname
+        if not os.path.exists(syspath2):
+            raise ValueError("%s had no syspath (%s)" % (devpath, syspath))
+        syspath = syspath2
 
     ptpath = os.path.join(syspath, "partition")
     if not os.path.exists(ptpath):

=== modified file 'curtin/commands/block_meta.py'
--- curtin/commands/block_meta.py	2014-09-26 17:26:34 +0000
+++ curtin/commands/block_meta.py	2015-02-18 16:18:41 +0000
@@ -199,6 +199,9 @@
             rootdev = devnode + "1"
         bootdev = None
 
+    if not os.path.exists(rootdev):
+        rootdev = devnode + "p1"
+
     LOG.debug("rootdev=%s bootdev=%s fmt=%s bootpt=%s",
               rootdev, bootdev, ptfmt, bootpt)
     logtime("creating partition with: %s" % ' '.join(ptcmd),

=== modified file 'helpers/common'
--- helpers/common	2014-12-08 20:01:44 +0000
+++ helpers/common	2015-02-18 16:18:41 +0000
@@ -153,8 +153,8 @@
     if $isblk; then
         blockdev --rereadpt "$target"
         udevadm settle
-        [ -b "${target}1" ] ||
-            { error "no partition found ${target}1"; return 1; }
+        [ -b "${target}1" ] || [ -b "${target}p1" ] ||
+            { error "no partition found ${target}1 or ${target}p1"; return 1; }
         [ -b "${target}15" ] ||
             { error "no partition found ${target}15"; return 1; }
         if [ "$boot" = true ]; then
@@ -191,8 +191,8 @@
     if $isblk; then
         blockdev --rereadpt "$target"
         udevadm settle
-        [ -b "${target}1" ] ||
-            { error "no partition found ${target}1"; return 1; }
+        [ -b "${target}1" ] || [ -b "${target}p1" ] ||
+            { error "no partition found ${target}1 or ${target}p1"; return 1; }
         [ -b "${target}15" ] ||
             { error "no partition found ${target}15"; return 1; }
     fi
@@ -250,8 +250,8 @@
     if $isblk; then
         blockdev --rereadpt "$target"
         udevadm settle
-        [ -b "${target}1" ] ||
-            { error "no partition found ${target}1"; return 1; }
+        [ -b "${target}1" ] || [ -b "${target}p1" ] ||
+            { error "no partition found ${target}1 or ${target}p1"; return 1; }
     fi
     out=$(wipefs "--offset=$(($start*512))" "$target" 2>&1) || {
         error "$out";