From bf8ea7511e0bfeaa2c381c1d575745cf171e5bec Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 9 Dec 2011 12:15:28 +0400 Subject: [PATCH] Add check pkg for exec templates with cl-template --- client/undomain/calculate-client/reconfigurePackages | 2 +- install/1live/openrc/reconfigurePackages | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/undomain/calculate-client/reconfigurePackages b/client/undomain/calculate-client/reconfigurePackages index be95e7e..017e5cb 100644 --- a/client/undomain/calculate-client/reconfigurePackages +++ b/client/undomain/calculate-client/reconfigurePackages @@ -1,4 +1,4 @@ -# Calculate path=/tmp name=reconfigureXorg exec=/bin/bash os_root_type==livecd +# Calculate path=/tmp pkg(x11-base/xorg-server)!=&&os_root_type==livecd name=reconfigureXorg exec=/bin/bash # reconfigure conf.d/xdm after undomain action on livecd cl-template -l all --merge x11-base/xorg-server &>/dev/null diff --git a/install/1live/openrc/reconfigurePackages b/install/1live/openrc/reconfigurePackages index d874799..abe5d88 100644 --- a/install/1live/openrc/reconfigurePackages +++ b/install/1live/openrc/reconfigurePackages @@ -1,4 +1,4 @@ -# Calculate path=/tmp name=reconfigure exec=/bin/bash ac_install_system!=up&&cl_belong_pkg!= +# Calculate path=/tmp name=reconfigure exec=/bin/bash ac_install_system!=up&&cl_belong_pkg!=&&pkg(sys-apps/baselayout)!= cl-template -l all --merge sys-apps/baselayout &>/dev/null true