From 535da71b1e3adcbb36c548de2cdc29d4664169f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 23 Oct 2018 19:03:07 +0200 Subject: [PATCH] [initcpiocfg] adopt development changes --- src/modules/initcpiocfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index b990893ed..dedf2a990 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -4,7 +4,7 @@ # === This file is part of Calamares - === # # Copyright 2014, Rohan Garg -# Copyright 2015, Philip Müller +# Copyright 2015 - 2018, Philip Müller # Copyright 2017, Alf Gaida # # Calamares is free software: you can redistribute it and/or modify @@ -156,7 +156,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): elif (btrfs == "yes" and cpu['proc0']['vendor_id'].lower() == "genuineintel"): modules.append("crc32c-intel") - else: + elif not os.path.exists(os.path.join(root_mount_point, "usr/bin/grub-set-bootflag")): hooks.append("fsck") write_mkinitcpio_lines(hooks, modules, files, root_mount_point)