When /etc/lxcf/lxcf.conf does not exist, it restores /etc/lxcf.

diff --git a/lxcf/Makefile b/lxcf/Makefile
index 93f1fcd..c540f93 100644 (file)
--- a/lxcf/Makefile
+++ b/lxcf/Makefile
@@ -121,6 +121,7 @@ install_conf :
        mkdir -p ${prefix}/etc/lxcf
        chmod 755 ${prefix}/etc/lxcf
        install -o root -g root -m 644 conf/lxcf.conf ${prefix}/etc/lxcf/lxcf.conf
+       install -o root -g root -m 644 conf/lxcf.conf ${prefix}/usr/lib/lxcf/lxcf.conf
        mkdir -p ${prefix}/usr/lib/systemd/system
        install -o root -g root -m 600 conf/lxcf.service ${prefix}/usr/lib/systemd/system/lxcf.service
        mkdir -p ${prefix}/etc/systemd/system/multi-user.target.wants

diff --git a/lxcf/Makefile_fedora19 b/lxcf/Makefile_fedora19
index e5d39bf..60e62f5 100644 (file)
--- a/lxcf/Makefile_fedora19
+++ b/lxcf/Makefile_fedora19
@@ -112,6 +112,7 @@ install_conf :
        mkdir -p ${prefix}/etc/lxcf
        chmod 755 ${prefix}/etc/lxcf
        install -o root -g root -m 644 conf/lxcf.conf ${prefix}/etc/lxcf/lxcf.conf
+       install -o root -g root -m 644 conf/lxcf.conf ${prefix}/usr/lib/lxcf/lxcf.conf
        mkdir -p ${prefix}/usr/lib/systemd/system
        install -o root -g root -m 600 conf/lxcf.service ${prefix}/usr/lib/systemd/system/lxcf.service
        mkdir -p ${prefix}/etc/systemd/system/multi-user.target.wants

diff --git a/lxcf/lib/lxcf-clone b/lxcf/lib/lxcf-clone
index 3b9bb0d..60c0337 100755 (executable)
--- a/lxcf/lib/lxcf-clone
+++ b/lxcf/lib/lxcf-clone
@@ -65,6 +65,11 @@ mkdir -p /etc/lxcf/rsc
 chmod 755 /etc/lxcf
 chmod 755 /etc/lxcf/rsc
 
+# check lxcf.conf
+if [ ! -e /etc/lxcf/lxcf.conf ] ; then
+  cp -p /usr/lib/lxcf/lxcf.conf /etc/lxcf/lxcf.conf
+fi
+
 # cp files
 cpfiles() {
 

diff --git a/lxcf/lib/lxcf-erase b/lxcf/lib/lxcf-erase
index 927e970..1cbc088 100755 (executable)
--- a/lxcf/lib/lxcf-erase
+++ b/lxcf/lib/lxcf-erase
@@ -31,6 +31,11 @@ mkdir -p /etc/lxcf/rsc
 chmod 755 /etc/lxcf
 chmod 755 /etc/lxcf/rsc
 
+# check lxcf.conf
+if [ ! -e /etc/lxcf/lxcf.conf ] ; then
+  cp -p /usr/lib/lxcf/lxcf.conf /etc/lxcf/lxcf.conf
+fi
+
 # erase one container
 lxcf_erase1() {
   LXCNAME=$1

diff --git a/lxcf/lib/lxcf-sysgen b/lxcf/lib/lxcf-sysgen
index e18fe03..fff7057 100755 (executable)
--- a/lxcf/lib/lxcf-sysgen
+++ b/lxcf/lib/lxcf-sysgen
@@ -16,6 +16,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
 # 02110-1301, USA.
 
+
+# check /opt/lxcf
+mkdir -p /opt/lxcf
+chmod 755 /opt/lxcf
+
+# check /etc/lxcf/rsc
+mkdir -p /etc/lxcf/rsc
+chmod 755 /etc/lxcf
+chmod 755 /etc/lxcf/rsc
+
+# check lxcf.conf
+if [ ! -e /etc/lxcf/lxcf.conf ] ; then
+  cp -p /usr/lib/lxcf/lxcf.conf /etc/lxcf/lxcf.conf
+fi
+
 # check default separate mdoel
 /usr/lib/lxcf/lxcf-config
 if [ -e /etc/lxcf/separate ] ; then
@@ -64,15 +79,6 @@ if [ ${FLG_C} -eq 1 ] ; then
   fi
 fi
 
-# check /opt/lxcf
-mkdir -p /opt/lxcf
-chmod 755 /opt/lxcf
-
-# check /etc/lxcf/rsc
-mkdir -p /etc/lxcf/rsc
-chmod 755 /etc/lxcf
-chmod 755 /etc/lxcf/rsc
-
 # generate one container
 lxcf_sysgen1() {
   LXCNAME=${1}

diff --git a/lxcf/lxcf.spec b/lxcf/lxcf.spec
index ac1ed1c..edeb628 100644 (file)
--- a/lxcf/lxcf.spec
+++ b/lxcf/lxcf.spec
@@ -124,6 +124,7 @@ systemctl restart libvirtd
 /usr/lib/lxcf/sbin/suspend
 /usr/lib/lxcf/sbin/suspend-n
 /usr/lib/lxcf/sbin/list
+/usr/lib/lxcf/lxcf.conf
 /etc/lxcf/lxcf.conf
 /etc/libvirt/hooks/lxc
 /etc/libvirt/hooks/qemu