From a27de3f8a235305929d3ad7cbb74719baf3cddd8 Mon Sep 17 00:00:00 2001 From: Ramil Minishev Date: Fri, 4 Feb 2022 00:23:13 +0300 Subject: [PATCH] Make growvols config path platform independent Change-Id: I9b8fdf96c8543bff92019fb82f10493de7728a26 --- .../elements/growvols/init-scripts/systemd/growvols.service | 2 +- diskimage_builder/elements/growvols/post-install.d/80-growvols | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diskimage_builder/elements/growvols/init-scripts/systemd/growvols.service b/diskimage_builder/elements/growvols/init-scripts/systemd/growvols.service index 1b17ecb1..d735482b 100644 --- a/diskimage_builder/elements/growvols/init-scripts/systemd/growvols.service +++ b/diskimage_builder/elements/growvols/init-scripts/systemd/growvols.service @@ -5,7 +5,7 @@ After=systemd-udev-settle.service [Service] Type=oneshot -EnvironmentFile=-/etc/sysconfig/growvols +EnvironmentFile=-/etc/default/growvols User=root ExecStart=/usr/local/sbin/growvols --verbose --yes RemainAfterExit=true diff --git a/diskimage_builder/elements/growvols/post-install.d/80-growvols b/diskimage_builder/elements/growvols/post-install.d/80-growvols index 8a29c0c6..1aa646b0 100755 --- a/diskimage_builder/elements/growvols/post-install.d/80-growvols +++ b/diskimage_builder/elements/growvols/post-install.d/80-growvols @@ -12,7 +12,7 @@ case ${DIB_GROWVOLS_TRIGGER} in *) echo "Unsupported DIB_GROWVOLS_TRIGGER: ${DIB_GROWVOLS_TRIGGER}"; exit 1 ;; esac -cat << EOF | sudo tee /etc/sysconfig/growvols > /dev/null +cat << EOF | sudo tee /etc/default/growvols > /dev/null GROWVOLS_ARGS="${DIB_GROWVOLS_ARGS}" GROWVOLS_GROUP="${DIB_GROWVOLS_GROUP}" GROWVOLS_DEVICE="${DIB_GROWVOLS_DEVICE}"