[RESEND,v1,5/8] tools: remove empty xl.conf

Commit Message

Olaf Hering Sept. 24, 2019, 2:03 p.m. UTC

In the near future all fresh installations will have an empty /etc.
The content of this directory will not be controlled by the package
manager anymore. One of the reasons for this move is to make snapshots
more robust.

Installing empty configuration files is not helpful for an empty /etc
directory. The expected values are all described in xl.conf(5). There is
no need to duplicate this info into another file.

If the local admin really needs to tweak the defaults he will be able to
create this file with the desired content.

Signed-off-by: Olaf Hering <[e-mail]>
Acked-by: Dario Faggioli <[e-mail]>
---
 tools/examples/Makefile |  1 -
 tools/examples/README   |  1 -
 tools/examples/xl.conf  | 44 --------------------------------------------
 3 files changed, 46 deletions(-)
 delete mode 100644 tools/examples/xl.conf

Patch

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 2a6c5444d4..147ea590ef 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -6,7 +6,6 @@  XEN_READMES = README
 
 XEN_CONFIGS += xlexample.hvm
 XEN_CONFIGS += xlexample.pvlinux
-XEN_CONFIGS += xl.conf
 XEN_CONFIGS += cpupool
 
 XEN_CONFIGS += $(XEN_CONFIGS-y)
diff --git a/tools/examples/README b/tools/examples/README
index c3f24d59fa..48ace82189 100644
--- a/tools/examples/README
+++ b/tools/examples/README
@@ -26,7 +26,6 @@  xen-hotplug-common.sh - sourced by vif-common.sh
 xen-network-common.sh - sourced by vif-common.sh
 xen-script-common.sh  - sourced by xen-hotplug-common.sh
 oxenstored.conf     - configuration file for oxenstored
-xl.conf             - configuration file for xl
 xlexample.hvm       - a configuration script for creating a hvm domain with
                       'xl create'
 xlexample.pvlinux   - a configuration script for creating a pv domain with
diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
deleted file mode 100644
index 0446deb304..0000000000
--- a/tools/examples/xl.conf
+++ /dev/null
@@ -1,44 +0,0 @@ 
-## Global XL config file ##
-
-# Control whether dom0 is ballooned down when xen doesn't have enough
-# free memory to create a domain.  "auto" means only balloon if dom0
-# starts with all the host's memory.
-#autoballoon="auto"
-
-# full path of the lockfile used by xl during domain creation
-#lockfile="/var/lock/xl"
-
-# default output format used by "xl list -l"
-#output_format="json"
-
-# first block device to be used for temporary VM disk mounts
-#blkdev_start="xvda"
-
-# default option to run hotplug scripts from xl
-# if disabled the old behaviour will be used, and hotplug scripts will be
-# launched by udev.
-#run_hotplug_scripts=1
-
-# default backend domain to connect guest vifs to.  This can be any
-# valid domain identifier.
-#vif.default.backend="0"
-
-# default gateway device to use with vif-route hotplug script
-#vif.default.gatewaydev="eth0"
-
-# default vif script to use if none is specified in the guest config
-#vif.default.script="vif-bridge"
-
-# default bridge device to use with vif-bridge hotplug scripts
-#vif.default.bridge="xenbr0"
-
-# Reserve a claim of memory when launching a guest. This guarantees immediate
-# feedback whether the guest can be launched due to memory exhaustion
-# (which can take a long time to find out if launching huge guests).
-# see xl.conf(5) for details.
-#claim_mode=1
-
-# Specify global vcpu hard affinity masks. See xl.conf(5) for details.
-#vm.cpumask="0-7"
-#vm.pv.cpumask="0-3"
-#vm.hvm.cpumask="3-7"