From ae8a97b6d920e46d146a74ccdc6b9a5f34151a7f Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 3 May 2020 17:08:32 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: +augeas-lenses 1.10.1-2 all +cpu-checker 0.7-0ubuntu7 amd64 +db-util 1:5.3.21~exp1ubuntu2 all +db5.3-util 5.3.28-13.1ubuntu1.1 amd64 +extlinux 3:6.03+dfsg1-2 amd64 +fb-tools 1.5.3~ubuntu18.04 all +icoutils 0.32.3-1 amd64 +ipxe-qemu 1.0.0+git-20180124.fbe8c52d-0ubuntu2.2 all +ipxe-qemu-256k-compat-efi-roms 1.0.0+git-20150424.a25a16d-0ubuntu2 all +ldmtool 0.2.3-7 amd64 +libafflib0v5 3.7.16-2build2 amd64 +libaio1 0.3.110-5ubuntu0.1 amd64 +libaugeas0 1.10.1-2 amd64 +libbfio1 20170123-4 amd64 +libcacard0 1:2.5.0-3 amd64 +libdate-manip-perl 6.60-1 all +libewf2 20140608-6.1build1 amd64 +libfdt1 1.4.5-3 amd64 +libguestfs0 1:1.36.13-1ubuntu3.3 amd64 +libhivex0 1.3.15-1 amd64 +libibverbs1 17.1-1ubuntu0.2 amd64 +libiscsi7 1.17.0-1.1 amd64 +libldm-1.0-0 0.2.3-7 amd64 +libnl-route-3-200 3.2.29-0ubuntu3 amd64 +librados2 12.2.12-0ubuntu0.18.04.5 amd64 +librbd1 12.2.12-0ubuntu0.18.04.5 amd64 +librdmacm1 17.1-1ubuntu0.2 amd64 +libspice-server1 0.14.0-1ubuntu2.4 amd64 +libtsk13 4.4.2-3 amd64 +libusbredirparser1 0.7.1-1 amd64 +libvirt0 4.0.0-1ubuntu8.15 amd64 +libxen-4.9 4.9.2-0ubuntu1 amd64 +libxenstore3.0 4.9.2-0ubuntu1 amd64 +lsscsi 0.28-0.1 amd64 +lzop 1.03-4 amd64 +msr-tools 1.3-2build1 amd64 +osinfo-db 0.20180929-1ubuntu0.1 all +pwgen 2.08-1 amd64 +pyflakes 1.6.0-1 all +pyflakes3 1.6.0-1 all +python-babel-localedata 2.4.0+dfsg.1-2ubuntu1 all +python-pyflakes 1.6.0-1 all +python3-attr 17.4.0-2 all +python3-babel 2.4.0+dfsg.1-2ubuntu1 all +python3-fb-tools 1.5.3~ubuntu18.04 all +python3-flake8 3.5.0-1 all +python3-guestfs 1:1.36.13-1ubuntu3.3 amd64 +python3-magic 2:0.4.15-1 all +python3-mccabe 0.6.1-2 all +python3-pb-logging 0.5.5~ubuntu18.04 all +python3-pbr 3.1.1-3ubuntu3 all +python3-pluggy 0.6.0-1 all +python3-py 1.5.2-1 all +python3-pycodestyle 2.3.1-2 all +python3-pyflakes 1.6.0-1 all +python3-pytest 3.3.2-2 all +python3-pyvmomi 6.5.0.2017.5-0ubuntu1 all +python3-toml 0.9.3-1 all +python3-tz 2018.3-2 all +python3-unidiff 0.5.4-1 all +python3-virtualenv 15.1.0+ds-1.1 all +qemu-block-extra 1:2.11+dfsg-1ubuntu7.23 amd64 +qemu-system-common 1:2.11+dfsg-1ubuntu7.23 amd64 +qemu-system-x86 1:2.11+dfsg-1ubuntu7.23 amd64 +qemu-utils 1:2.11+dfsg-1ubuntu7.23 amd64 +scrub 2.6.1-1build1 amd64 +seabios 1.10.2-1ubuntu1 all +sgabios 0.0~svn8-4 all +sharutils 1:4.15.2-3 amd64 +sleuthkit 4.4.2-3 amd64 +supermin 5.1.19-2ubuntu1 amd64 +zerofree 1.0.4-1 amd64 --- .etckeeper | 4 ++ alternatives/pybabel | 1 + default/qemu-kvm | 10 +++++ group | 2 + group- | 3 +- gshadow | 2 + gshadow- | 3 +- modprobe.d/qemu-system-x86.conf | 1 + qemu-ifdown | 6 +++ qemu-ifup | 42 +++++++++++++++++++ .../multi-user.target.wants/qemu-kvm.service | 1 + 11 files changed, 73 insertions(+), 2 deletions(-) create mode 120000 alternatives/pybabel create mode 100644 default/qemu-kvm create mode 100644 modprobe.d/qemu-system-x86.conf create mode 100755 qemu-ifdown create mode 100755 qemu-ifup create mode 120000 systemd/system/multi-user.target.wants/qemu-kvm.service diff --git a/.etckeeper b/.etckeeper index 268c847..c391454 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1112,6 +1112,7 @@ maybe chmod 0644 'default/ntp' maybe chmod 0644 'default/ntpdate' maybe chmod 0644 'default/numlockx' maybe chmod 0644 'default/openvpn' +maybe chmod 0644 'default/qemu-kvm' maybe chmod 0644 'default/rsync' maybe chmod 0644 'default/rsyslog' maybe chmod 0644 'default/saned' @@ -1919,6 +1920,7 @@ maybe chmod 0644 'modprobe.d/dkms.conf' maybe chmod 0644 'modprobe.d/intel-microcode-blacklist.conf' maybe chmod 0644 'modprobe.d/iwlwifi.conf' maybe chmod 0644 'modprobe.d/mdadm.conf' +maybe chmod 0644 'modprobe.d/qemu-system-x86.conf' maybe chmod 0644 'modules' maybe chmod 0755 'modules-load.d' maybe chmod 0644 'modules-load.d/cups-filters.conf' @@ -2132,6 +2134,8 @@ maybe chmod 0755 'python3' maybe chmod 0755 'python3.6' maybe chmod 0644 'python3.6/sitecustomize.py' maybe chmod 0644 'python3/debian_config' +maybe chmod 0755 'qemu-ifdown' +maybe chmod 0755 'qemu-ifup' maybe chmod 0755 'rc0.d' maybe chmod 0755 'rc1.d' maybe chmod 0755 'rc2.d' diff --git a/alternatives/pybabel b/alternatives/pybabel new file mode 120000 index 0000000..269ae50 --- /dev/null +++ b/alternatives/pybabel @@ -0,0 +1 @@ +/usr/bin/pybabel-python3 \ No newline at end of file diff --git a/default/qemu-kvm b/default/qemu-kvm new file mode 100644 index 0000000..5e98e61 --- /dev/null +++ b/default/qemu-kvm @@ -0,0 +1,10 @@ +# Set to 1 to enable KSM, 0 to disable KSM, and AUTO to use default settings. +# After changing this setting restart the qemu-kvm service. +KSM_ENABLED=AUTO +SLEEP_MILLISECS=200 + +# Dropped VHOST_NET_ENABLED as this is auto-loaded in recent kernels +# it still works, but is deprecated and will be removed in a later version + +# Dropped KVM_HUGEPAGES as systemd provides feasible hugepage moutpoints +# it still works, but is deprecated and will be removed in a later version diff --git a/group b/group index 24db76d..229d341 100644 --- a/group +++ b/group @@ -70,3 +70,5 @@ bind:x:130: postfix:x:131: postdrop:x:132: plex:x:963:frank +kvm:x:133: +rdma:x:134: diff --git a/group- b/group- index e2ef7b1..6ce593f 100644 --- a/group- +++ b/group- @@ -30,7 +30,7 @@ src:x:40: gnats:x:41: shadow:x:42: utmp:x:43: -video:x:44: +video:x:44:plex sasl:x:45: plugdev:x:46:frank staff:x:50: @@ -70,3 +70,4 @@ bind:x:130: postfix:x:131: postdrop:x:132: plex:x:963:frank +kvm:x:133: diff --git a/gshadow b/gshadow index 603e654..311014a 100644 --- a/gshadow +++ b/gshadow @@ -70,3 +70,5 @@ bind:!:: postfix:!:: postdrop:!:: plex:!::frank +kvm:!:: +rdma:!:: diff --git a/gshadow- b/gshadow- index 4cfd31d..77ce9a7 100644 --- a/gshadow- +++ b/gshadow- @@ -30,7 +30,7 @@ src:*:: gnats:*:: shadow:*:: utmp:*:: -video:*:: +video:*::plex sasl:*:: plugdev:*::frank staff:*:: @@ -70,3 +70,4 @@ bind:!:: postfix:!:: postdrop:!:: plex:!::frank +kvm:!:: diff --git a/modprobe.d/qemu-system-x86.conf b/modprobe.d/qemu-system-x86.conf new file mode 100644 index 0000000..679c3a6 --- /dev/null +++ b/modprobe.d/qemu-system-x86.conf @@ -0,0 +1 @@ +options kvm_intel nested=1 diff --git a/qemu-ifdown b/qemu-ifdown new file mode 100755 index 0000000..b2dc471 --- /dev/null +++ b/qemu-ifdown @@ -0,0 +1,6 @@ +#! /bin/sh +# Script to shut down a network (tap) device for qemu. +# Initially this script is empty, but you can configure, +# for example, accounting info here. + +: diff --git a/qemu-ifup b/qemu-ifup new file mode 100755 index 0000000..f2f4d5d --- /dev/null +++ b/qemu-ifup @@ -0,0 +1,42 @@ +#! /bin/sh +# Script to bring a network (tap) device for qemu up. +# The idea is to add the tap device to the same bridge +# as we have default routing to. + +# in order to be able to find brctl +PATH=$PATH:/sbin:/usr/sbin +ip=$(which ip) + +if [ -n "$ip" ]; then + ip link set "$1" up +else + brctl=$(which brctl) + if [ ! "$ip" -o ! "$brctl" ]; then + echo "W: $0: not doing any bridge processing: neither ip nor brctl utility not found" >&2 + exit 0 + fi + ifconfig "$1" 0.0.0.0 up +fi + +switch=$(ip route ls | \ + awk '/^default / { + for(i=0;i&2 diff --git a/systemd/system/multi-user.target.wants/qemu-kvm.service b/systemd/system/multi-user.target.wants/qemu-kvm.service new file mode 120000 index 0000000..d612222 --- /dev/null +++ b/systemd/system/multi-user.target.wants/qemu-kvm.service @@ -0,0 +1 @@ +/lib/systemd/system/qemu-kvm.service \ No newline at end of file -- 2.39.5