PR#3585: kiwi: Make /dev mounting by magic - koji

koji

#3585 kiwi: Make /dev mounting by magic

Merged a year ago by tkopecek. Opened a year ago by ignatenkobrain.

ignatenkobrain/koji mount_dev into master

kiwi: Bind-mount /dev into the buildroot for old-chroot

Igor Raits • a year ago

b07e817

Revert "PR#3568: kiwi: don't bind builders's /dev"

Igor Raits • a year ago

eff162e

plugins/builder/kiwi.py

file modified

+5 -4

		`@@ -65,6 +65,8 @@`
		`opts['scratch'] = False`
		`if not opts.get('optional_arches'):`
		`opts['optional_arches'] = []`
		`+ if not buildconfig['extra'].get('mock.new_chroot', True):`
		`+ opts['mount_dev'] = True`
		`self.opts = opts`

		`# get configuration`
		`@@ -304,10 +306,9 @@`
		`desc_url, desc_path, opts=None):`
		`self.opts = opts`
		`build_tag = target_info['build_tag']`
		`- if opts.get('bind_dev'):`
		`- bind_opts = {'dirs': {'/dev': '/dev'}}`
		`- else:`
		`- bind_opts = None`
		`+ bind_opts = {'dirs': {}}`
		`+ if self.opts.get('mount_dev'):`
		`+ bind_opts['dirs']['/dev'] = '/dev'`
		`broot = BuildRoot(self.session, self.options,`
		`tag=build_tag,`
		`arch=arch,`

plugins/cli/kiwi.py

file modified

-4

		`@@ -30,9 +30,6 @@`
		`parser.add_option("--type", help="Override default build type from description")`
		`parser.add_option("--make-prep", action="store_true", default=False,`
		`help="Run 'make prep' in checkout before starting the build")`
		`- parser.add_option("--bind-dev", action="store_true", default=False,`
		`- help="e.g. images using device-mapper needs /dev mounted in kiwi env, "`
		`- "while others can fail in such env.")`
		`parser.add_option("--can-fail", action="store", dest="optional_arches",`
		`metavar="ARCH1,ARCH2,...", default="",`
		`help="List of archs which are not blocking for build "`
		`@@ -55,7 +52,6 @@`
		`'target': target,`
		`'desc_url': scm,`
		`'desc_path': path,`
		`- 'bind_dev': options.bind_dev,`
		`}`
		`if options.scratch:`
		`kwargs['scratch'] = True`

plugins/hub/kiwi.py

file modified

+1 -3

		`@@ -17,7 +17,7 @@`
		`@export`
		`def kiwiBuild(target, arches, desc_url, desc_path, optional_arches=None, profile=None,`
		`scratch=False, priority=None, make_prep=False, repos=None, release=None,`
		`- type=None, bind_dev=False):`
		`+ type=None):`
		`context.session.assertPerm('image')`
		`for i in [desc_url, desc_path, profile, release]:`
		`if i is not None:`
		`@@ -52,8 +52,6 @@`
		`opts['release'] = release`
		`if optional_arches:`
		`opts['optional_arches'] = optional_arches`
		`- if bind_dev:`
		`- opts['bind_dev'] = bind_dev`
		`if repos:`
		`opts['repos'] = repos`
		`if make_prep:`

no initial comment

ignatenkobrain commented a year ago

cc @tkopecek @ngompa

See commit message for some background.

tkopecek commented a year ago

Makes sense to me - we can squeze it to 1.31 so we don't even introduce --bind-dev @ngompa?

ngompa commented a year ago

Wait, this doesn't make sense. Why doesn't Mock's nspawn mode expose device-mapper? We need it for building images with livemedia-creator too... @praiskup @msuchy

I'd rather just fix Mock so that we expose the device-mapper device like we do for btrfs-control

ngompa commented a year ago

PR submitted to Mock for this: https://github.com/rpm-software-management/mock/pull/1005

tkopecek commented a year ago

@ngompa @ignatenkobrain so, do we now think (after mock merged Neals' code) that we should revert #3568 ?