This is not used elsewhere, and probably never will. --- morphlib/fsutils.py | 9 --------- .../plugins/syslinux-disk-systembuilder_plugin.py | 7 ++++++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/morphlib/fsutils.py b/morphlib/fsutils.py index 45fb9e2..9786e38 100644 --- a/morphlib/fsutils.py +++ b/morphlib/fsutils.py @@ -28,15 +28,6 @@ def partition_image(runcmd, image_name): runcmd(['sfdisk', image_name], feed_stdin='1,,83,*\n') -def install_syslinux_mbr(runcmd, image_name): - for path in ['/usr/lib/extlinux/mbr.bin', - '/usr/share/syslinux/mbr.bin']: - if os.path.exists(path): - runcmd(['dd', 'if=' + path, 'of=' + image_name, - 'conv=notrunc']) - break - - def setup_device_mapping(runcmd, image_name): findstart = re.compile(r"start=\s+(\d+),") out = runcmd(['sfdisk', '-d', image_name]) diff --git a/morphlib/plugins/syslinux-disk-systembuilder_plugin.py b/morphlib/plugins/syslinux-disk-systembuilder_plugin.py index f6ebf05..e9647fd 100644 --- a/morphlib/plugins/syslinux-disk-systembuilder_plugin.py +++ b/morphlib/plugins/syslinux-disk-systembuilder_plugin.py @@ -103,7 +103,12 @@ class SyslinuxDiskBuilder(SystemKindBuilder): # pragma: no cover if arch not in ('x86', 'x86_64'): return with self.build_watch('install-mbr'): - morphlib.fsutils.install_syslinux_mbr(self.app.runcmd, image_name) + for path in ['/usr/lib/extlinux/mbr.bin', + '/usr/share/syslinux/mbr.bin']: + if os.path.exists(path): + self.app.runcmd(['dd', 'if=' + path, 'of=' + image_name, + 'conv=notrunc']) + break def _setup_device_mapping(self, image_name): self.app.status(msg='Device mapping partitions in %(filename)s', -- 1.7.5.4

This overrides the mbr search path to a file that doesn't exist. --- tests.as-root/syslinux-fails-if-no-mbr-found.exit | 1 + .../syslinux-fails-if-no-mbr-found.script | 90 ++++++++++++++++++++ .../syslinux-fails-if-no-mbr-found.stderr | 1 + 3 files changed, 92 insertions(+), 0 deletions(-) create mode 100644 tests.as-root/syslinux-fails-if-no-mbr-found.exit create mode 100755 tests.as-root/syslinux-fails-if-no-mbr-found.script create mode 100644 tests.as-root/syslinux-fails-if-no-mbr-found.stderr diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.exit b/tests.as-root/syslinux-fails-if-no-mbr-found.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests.as-root/syslinux-fails-if-no-mbr-found.exit @@ -0,0 +1 @@ +1 diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.script b/tests.as-root/syslinux-fails-if-no-mbr-found.script new file mode 100755 index 0000000..ef0cf33 --- /dev/null +++ b/tests.as-root/syslinux-fails-if-no-mbr-found.script @@ -0,0 +1,90 @@ +#!/bin/sh +# +# A system kind of syslinux-disk should create the disk image, plus a kernel +# file. +# +# Copyright (C) 2011, 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -eu + +# We only support x86 systems with syslinux-disk. +arch=$(uname -m) +case "$arch" in + x86*) ;; + *) exit 0 ;; +esac + +cache="$DATADIR/cache/artifacts" +kernelrepo="$DATADIR/kernel-repo" +morphsrepo="$DATADIR/morphs-repo" +log="$DATADIR/morph.log" + +cd "$morphsrepo" +git checkout --quiet -b custom master +cat <<EOF >system.morph +{ + "name": "system", + "kind": "system", + "system-kind": "syslinux-disk", + "arch": "$arch", + "disk-size": "1G", + "strata": [ + "stratum" + ] +} +EOF +cat <<EOF >stratum.morph +{ + "name": "stratum", + "kind": "stratum", + "sources": [ + { + "name": "hello", + "repo": "test:chunk-repo", + "ref": "farrokh", + "build-depends": [] + }, + { + "name": "linux", + "repo": "test:kernel-repo", + "ref": "custom", + "build-depends": ["hello"] + } + ] +} +EOF +git add system.morph stratum.morph +git commit --quiet -m "foo" + +cd "$kernelrepo" +git checkout --quiet -b custom master +cat <<EOF >linux.morph +{ + "name": "linux", + "kind": "chunk", + "install-commands": [ + "mkdir -p \"\$DESTDIR/boot\"", + "touch \"\$DESTDIR\"/boot/vmlinuz", + "touch \"\$DESTDIR\"/boot/System.map" + ] +} +EOF +git add linux.morph + +git commit --quiet -m 'Make the kernel create a dummy zImage' + +"$SRCDIR/scripts/test-morph" --syslinux-mbr-search-path=nosuchfile.bin \ + build test:morphs-repo custom system.morph > /dev/null diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.stderr b/tests.as-root/syslinux-fails-if-no-mbr-found.stderr new file mode 100644 index 0000000..e9bfd74 --- /dev/null +++ b/tests.as-root/syslinux-fails-if-no-mbr-found.stderr @@ -0,0 +1 @@ +ERROR: No syslinux mbr found in search paths: ['nosuchfile.bin'] -- 1.7.5.4