From 1f0aec5f8766856551dd95150f9337719465a0c9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 30 Nov 2020 14:35:21 +0100 Subject: [PATCH] [dracutlukscfg] Job-internal constant data doesn't need to be a member --- src/modules/dracutlukscfg/DracutLuksCfgJob.cpp | 11 ++++------- src/modules/dracutlukscfg/DracutLuksCfgJob.h | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp index 4aff72240..9e04292ec 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp @@ -23,21 +23,18 @@ // static const QLatin1String DracutLuksCfgJob::CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" ); -// static -const char* DracutLuksCfgJob::CONFIG_FILE_HEADER +static const char CONFIG_FILE_HEADER[] = "# Configuration file automatically written by the Calamares system installer\n" "# (This file is written once at install time and should be safe to edit.)\n" "# Enables support for LUKS full disk encryption with single sign on from GRUB.\n" "\n"; -// static -const char* DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_KEYFILE_LINE +static const char CONFIG_FILE_CRYPTTAB_KEYFILE_LINE[] = "# force installing /etc/crypttab even if hostonly=\"no\", install the keyfile\n" "install_items+=\" /etc/crypttab /crypto_keyfile.bin \"\n"; -// static -const char* DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE = "# force installing /etc/crypttab even if hostonly=\"no\"\n" - "install_items+=\" /etc/crypttab \"\n"; +static const char CONFIG_FILE_CRYPTTAB_LINE[] = "# force installing /etc/crypttab even if hostonly=\"no\"\n" + "install_items+=\" /etc/crypttab \"\n"; // static const QLatin1String DracutLuksCfgJob::CONFIG_FILE_SWAPLINE( diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index 0680badf4..03325e819 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -34,9 +34,6 @@ public: private: static const QLatin1String CONFIG_FILE; - static const char* CONFIG_FILE_HEADER; - static const char* CONFIG_FILE_CRYPTTAB_KEYFILE_LINE; - static const char* CONFIG_FILE_CRYPTTAB_LINE; static const QLatin1String CONFIG_FILE_SWAPLINE; };