From b5311fc943d3a4a149b17a44c6ace09d1d1073eb Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 18 Sep 2023 16:48:56 +0300 Subject: [PATCH] sys-apps/calculate-toolkit: fix cl-lxc --- ...uild => calculate-toolkit-0.3.2-r7.ebuild} | 1 + .../calculate-toolkit-0.3.2-fix_dir.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) rename sys-apps/calculate-toolkit/{calculate-toolkit-0.3.2-r6.ebuild => calculate-toolkit-0.3.2-r7.ebuild} (95%) create mode 100644 sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.2-fix_dir.patch diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r6.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r7.ebuild similarity index 95% rename from sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r6.ebuild rename to sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r7.ebuild index cc1a3b5fe..ae2aea6bd 100644 --- a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r6.ebuild +++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r7.ebuild @@ -25,4 +25,5 @@ PATCHES=( "${FILESDIR}"/${P}-fix_message.patch "${FILESDIR}"/${P}-start_services.patch "${FILESDIR}"/${P}-update_overlay.patch + "${FILESDIR}"/${P}-fix_dir.patch ) diff --git a/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.2-fix_dir.patch b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.2-fix_dir.patch new file mode 100644 index 000000000..defe85689 --- /dev/null +++ b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.2-fix_dir.patch @@ -0,0 +1,20 @@ +diff --git a/cl-lxc b/cl-lxc +index f93ee15..2e5a224 100755 +--- a/cl-lxc ++++ b/cl-lxc +@@ -544,6 +544,7 @@ create_lxc(){ + EOF + chmod 755 $path_lxc/rootfs/etc/local.d/firststart.start + ++ mkdir -p $path_lxc/rootfs/etc/calculate + cat <<- EOF > $path_lxc/rootfs/etc/calculate/calculate.env + # Parameters for firststart.start + [install] +@@ -631,6 +632,7 @@ update_prepare(){ + chmod 755 $path_lxc/rootfs/etc/local.d/firststart.start + + # если обновляемый контейнер ни разу не запускался, возьем временный конфиг ++ mkdir -p $path_lxc/rootfs/etc/calculate + if [[ -e ${path_work}/${name_upgrading}/rootfs${num_cur}/etc/calculate/calculate.env ]]; then + cp ${path_work}/${name_upgrading}/rootfs${num_cur}/etc/calculate/calculate.env \ + $path_lxc/rootfs/etc/calculate