- restore sysconfig files, drop init selection in configure

diff --git a/libvirt-guests.sysconfig b/libvirt-guests.sysconfig
new file mode 100644 (file)
index 0000000..669b046
--- /dev/null
+++ b/libvirt-guests.sysconfig
@@ -0,0 +1,50 @@
+# URIs to check for running guests
+# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+#URIS=default
+
+# action taken on host boot
+# - start   all guests which were running on shutdown are started on boot
+#           regardless on their autostart settings
+# - ignore  libvirt-guests init script won't start any guest on boot, however,
+#           guests marked as autostart will still be automatically started by
+#           libvirtd
+#ON_BOOT=start
+
+# Number of seconds to wait between each guest start. Set to 0 to allow
+# parallel startup.
+#START_DELAY=0
+
+# action taken on host shutdown
+# - suspend   all running guests are suspended using virsh managedsave
+# - shutdown  all running guests are asked to shutdown. Please be careful with
+#             this settings since there is no way to distinguish between a
+#             guest which is stuck or ignores shutdown requests and a guest
+#             which just needs a long time to shutdown. When setting
+#             ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
+#             value suitable for your guests.
+#ON_SHUTDOWN=suspend
+
+# Number of guests will be shutdown concurrently, taking effect when
+# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one
+# after another. Number of guests on shutdown at any time will not exceed number
+# set in this variable.
+#PARALLEL_SHUTDOWN=0
+
+# Number of seconds we're willing to wait for a guest to shut down. If parallel
+# shutdown is enabled, this timeout applies as a timeout for shutting down all
+# guests on a single URI defined in the variable URIS. If this is 0, then there
+# is no time out (use with caution, as guests might not respond to a shutdown
+# request). The default value is 300 seconds (5 minutes).
+#SHUTDOWN_TIMEOUT=300
+
+# If non-zero, try to bypass the file system cache when saving and
+# restoring guests, even though this may give slower operation for
+# some file systems.
+#BYPASS_CACHE=0
+
+# If non-zero, try to sync guest time on domain resume. Be aware, that
+# this requires guest agent with support for time synchronization
+# running in the guest. For instance, qemu-ga doesn't support guest time
+# synchronization on Windows guests, but Linux ones. By default, this
+# functionality is turned off.
+#SYNC_TIME=1

diff --git a/libvirt.spec b/libvirt.spec
index 0bc1a306a1d4bde7c5d0827db74a90e8297d437e..5ac08f9e02833c1bd7e43cdc87bac1edaaf15bdd 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -50,6 +50,10 @@ Source1:     libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
 Source4:       libvirt-guests.init
+Source5:       libvirtd.sysconfig
+Source6:       virtlockd.sysconfig
+Source7:       virtlogd.sysconfig
+Source8:       libvirt-guests.sysconfig
 Patch0:                %{name}-sasl.patch
 Patch1:                %{name}-qemu-acl.patch
 Patch2:                %{name}-udevadm-settle.patch
@@ -481,7 +485,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
        --with-bash-completions-dir=/etc/bash_completion.d \
        --with-html-dir=%{_gtkdocdir} \
        --with-html-subdir=%{name} \
-       --with-init-script=redhat \
        --with-packager="TLD-Linux" \
        --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
        --with-qemu-user=qemu \
@@ -541,6 +544,10 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirt-guests
+install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/libvirtd
+install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/virtlockd
+install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/virtlogd
+install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/libvirt-guests
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \

diff --git a/libvirtd.sysconfig b/libvirtd.sysconfig
new file mode 100644 (file)
index 0000000..a0afd64
--- /dev/null
+++ b/libvirtd.sysconfig
@@ -0,0 +1,6 @@
+# Override the default config file
+#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
+
+# Listen for TCP/IP connections
+# NB. must setup TLS/SSL keys prior to using this
+#LIBVIRTD_ARGS="--listen"

diff --git a/virtlockd.sysconfig b/virtlockd.sysconfig
new file mode 100644 (file)
index 0000000..068fcfd
--- /dev/null
+++ b/virtlockd.sysconfig
@@ -0,0 +1,2 @@
+# Pass extra arguments to virtlockd
+#VIRTLOCKD_ARGS=

diff --git a/virtlogd.sysconfig b/virtlogd.sysconfig
new file mode 100644 (file)
index 0000000..a8e989b
--- /dev/null
+++ b/virtlogd.sysconfig
@@ -0,0 +1,2 @@
+# Pass extra arguments to virtlogd
+#VIRTLOGD_ARGS=