diff --git a/assemblers/org.osbuild.rawfs b/assemblers/org.osbuild.rawfs index 8b5f16bf..894e3f5a 100755 --- a/assemblers/org.osbuild.rawfs +++ b/assemblers/org.osbuild.rawfs @@ -78,8 +78,8 @@ def main(tree, output_dir, options, loop_client): size = options["size"] fs_type = options.get("fs_type", "ext4") - image = f"/var/tmp/osbuild-image.raw" - mountpoint = f"/tmp/osbuild-mnt" + image = "/var/tmp/osbuild-image.raw" + mountpoint = "/tmp/osbuild-mnt" subprocess.run(["truncate", "--size", str(size), image], check=True) diff --git a/sources/org.osbuild.ostree b/sources/org.osbuild.ostree index 069ebde5..6026d9a1 100755 --- a/sources/org.osbuild.ostree +++ b/sources/org.osbuild.ostree @@ -9,7 +9,7 @@ import uuid def ostree(*args, _input=None, **kwargs): args = list(args) + [f'--{k}={v}' for k, v in kwargs.items()] - print(f"ostree " + " ".join(args), file=sys.stderr) + print("ostree " + " ".join(args), file=sys.stderr) subprocess.run(["ostree"] + args, encoding="utf-8", stdout=sys.stderr, diff --git a/stages/org.osbuild.ostree b/stages/org.osbuild.ostree index e4b255bc..751592fc 100755 --- a/stages/org.osbuild.ostree +++ b/stages/org.osbuild.ostree @@ -132,7 +132,7 @@ SCHEMA = """ def ostree(*args, _input=None, **kwargs): args = list(args) + [f'--{k}={v}' for k, v in kwargs.items()] - print(f"ostree " + " ".join(args), file=sys.stderr) + print("ostree " + " ".join(args), file=sys.stderr) subprocess.run(["ostree"] + args, encoding="utf-8", stdout=sys.stderr, diff --git a/stages/org.osbuild.systemd b/stages/org.osbuild.systemd index c9ff2094..465f2f44 100755 --- a/stages/org.osbuild.systemd +++ b/stages/org.osbuild.systemd @@ -44,13 +44,13 @@ def main(tree, options): default_target = options.get("default_target") for service in enabled_services: - subprocess.run([f"systemctl", "--root", tree, "enable", service], check=True) + subprocess.run(["systemctl", "--root", tree, "enable", service], check=True) for service in disabled_services: - subprocess.run([f"systemctl", "--root", tree, "disable", service], check=True) + subprocess.run(["systemctl", "--root", tree, "disable", service], check=True) if default_target: - subprocess.run([f"systemctl", "--root", tree, "set-default", default_target], check=True) + subprocess.run(["systemctl", "--root", tree, "set-default", default_target], check=True) return 0