diff --git a/stages/org.osbuild.keymap b/stages/org.osbuild.keymap index 080d3eb6..03704434 100755 --- a/stages/org.osbuild.keymap +++ b/stages/org.osbuild.keymap @@ -14,8 +14,9 @@ def main(tree, options): # the assumption is wrong, because it contains a default value from RPM package. try: os.remove(f"{tree}/etc/vconsole.conf") + print("/etc/vconsole.conf already exists. Replacing.") except FileNotFoundError: - print("vconsole.conf does not exist") + pass subprocess.run(["systemd-firstboot", f"--root={tree}", f"--keymap={keymap}"], check=True) diff --git a/stages/org.osbuild.timezone b/stages/org.osbuild.timezone index bc5234c4..babcd4bf 100755 --- a/stages/org.osbuild.timezone +++ b/stages/org.osbuild.timezone @@ -16,8 +16,9 @@ def main(tree, options): try: os.remove(f"{tree}/etc/localtime") # ^ This will fail once systemd RPM package stops shipping the file + print("/etc/localtime already exists. Replacing.") except FileNotFoundError: - print("systemd does not ship /etc/localtime anymore. Remove the workaround") + pass subprocess.run(["systemd-firstboot", f"--root={tree}", f"--timezone={zone}"], check=True)