From: Frank Brehm Date: Sat, 11 Nov 2017 16:34:13 +0000 (+0100) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=8fc97ecff53ecfeae1a66cfdd83e504cd8da29e8;p=config%2Fvera%2Fetc.git committing changes in /etc after apt run Package changes: -apt 1.5 amd64 +apt 1.6~alpha4 amd64 -apt-utils 1.5 amd64 +apt-utils 1.6~alpha4 amd64 -aspell-de 20161207-1 all -aspell-de-1901 1:2-31 all +aspell-de 20161207-3 all +aspell-de-1901 1:2-32 all -at 3.1.20-3 amd64 +at 3.1.20-3.1 amd64 -bind9-host 1:9.10.3.dfsg.P4-12.6 amd64 -binutils 2.29.1-4 amd64 -binutils-common 2.29.1-4 amd64 -binutils-x86-64-linux-gnu 2.29.1-4 amd64 -bsdmainutils 9.0.12+nmu1 amd64 +bind9-host 1:9.10.6+dfsg-5 amd64 +binutils 2.29.1-6 amd64 +binutils-common 2.29.1-6 amd64 +binutils-x86-64-linux-gnu 2.29.1-6 amd64 +bsdmainutils 9.0.14 amd64 -chrony 3.2-1 amd64 +chrony 3.2-1+b1 amd64 -console-setup 1.168 all -console-setup-linux 1.168 all +console-setup 1.170 all +console-setup-linux 1.170 all -cpp-7 7.2.0-8 amd64 +cpp-7 7.2.0-12 amd64 -dbus 1.11.20-1 amd64 +dbus 1.12.0-1 amd64 -debconf 1.5.63 all -debconf-i18n 1.5.63 all -debconf-utils 1.5.63 all +debconf 1.5.64 all +debconf-i18n 1.5.64 all +debconf-utils 1.5.64 all -dirmngr 2.2.1-2 amd64 +dirmngr 2.2.1-5 amd64 -distro-info-data 0.36 all -dmeventd 2:1.02.142-1 amd64 +distro-info-data 0.37 all +dmeventd 2:1.02.145-1 amd64 -dmsetup 2:1.02.142-1 amd64 +dmsetup 2:1.02.145-1 amd64 -dnsutils 1:9.10.3.dfsg.P4-12.6 amd64 +dnsutils 1:9.10.6+dfsg-5 amd64 -dpkg 1.18.24 amd64 -dpkg-dev 1.18.24 all -e2fslibs 1.43.6-1 amd64 -e2fsprogs 1.43.6-1 amd64 +dpkg 1.19.0.4 amd64 +dpkg-dev 1.19.0.4 all +e2fslibs 1.43.7-1 amd64 +e2fsprogs 1.43.7-1 amd64 -g++-7 7.2.0-8 amd64 +g++-7 7.2.0-12 amd64 -gcc-6-base 6.4.0-8 amd64 -gcc-7 7.2.0-8 amd64 -gcc-7-base 7.2.0-8 amd64 +gcc-6-base 6.4.0-9 amd64 +gcc-7 7.2.0-12 amd64 +gcc-7-base 7.2.0-12 amd64 -git 1:2.14.2-1 amd64 -git-email 1:2.14.2-1 all -git-man 1:2.14.2-1 all -gnupg 2.2.1-2 amd64 +git 1:2.15.0-1 amd64 +git-email 1:2.15.0-1 all +git-man 1:2.15.0-1 all +gnupg 2.2.1-5 amd64 -gnupg-l10n 2.2.1-2 all -gnupg-utils 2.2.1-2 amd64 -gpg 2.2.1-2 amd64 -gpg-agent 2.2.1-2 amd64 -gpg-wks-client 2.2.1-2 amd64 -gpg-wks-server 2.2.1-2 amd64 -gpgconf 2.2.1-2 amd64 -gpgsm 2.2.1-2 amd64 -gpgv 2.2.1-2 amd64 +gnupg-l10n 2.2.1-5 all +gnupg-utils 2.2.1-5 amd64 +gpg 2.2.1-5 amd64 +gpg-agent 2.2.1-5 amd64 +gpg-wks-client 2.2.1-5 amd64 +gpg-wks-server 2.2.1-5 amd64 +gpgconf 2.2.1-5 amd64 +gpgsm 2.2.1-5 amd64 +gpgv 2.2.1-5 amd64 -ifupdown 0.8.25 amd64 -ingerman 20161207-1 all -init 1.50 amd64 -init-system-helpers 1.50 all +ifupdown 0.8.29 amd64 +ingerman 20161207-3 all +init 1.51 amd64 +init-system-helpers 1.51 all -iptables 1.6.1-2 amd64 +iptables 1.6.1-2+b1 amd64 -ipython 5.1.0-3 all -ipython3 5.1.0-3 all -isc-dhcp-client 4.3.5-3 amd64 -isc-dhcp-common 4.3.5-3 amd64 +ipython 5.5.0-1 all +ipython3 5.5.0-1 all +isc-dhcp-client 4.3.5-3+b1 amd64 +isc-dhcp-common 4.3.5-3+b1 amd64 -iswiss 20161207-1 all +iswiss 20161207-3 all -keyboard-configuration 1.168 all +keyboard-configuration 1.170 all -krb5-locales 1.15.1-2 all +krb5-locales 1.15.2-2 all -libapparmor1 2.11.0-11 amd64 -libapt-inst2.0 1.5 amd64 -libapt-pkg5.0 1.5 amd64 -libasan4 7.2.0-8 amd64 +libapparmor1 2.11.1-3 amd64 +libapt-inst2.0 1.6~alpha4 amd64 +libapt-pkg5.0 1.6~alpha4 amd64 +libasan4 7.2.0-12 amd64 -libatomic1 7.2.0-8 amd64 +libatomic1 7.2.0-12 amd64 -libaudit-common 1:2.7.8-1 all -libaudit1 1:2.7.8-1 amd64 +libaudit-common 1:2.8.1-1 all +libaudit1 1:2.8.1-1 amd64 -libbinutils 2.29.1-4 amd64 +libbind9-141 1:9.10.6+dfsg-5 amd64 +libbinutils 2.29.1-6 amd64 -libboost-filesystem1.62.0 1.62.0+dfsg-4+b1 amd64 -libboost-iostreams1.62.0 1.62.0+dfsg-4+b1 amd64 -libboost-system1.62.0 1.62.0+dfsg-4+b1 amd64 -libbsd0 0.8.6-2 amd64 +libboost-filesystem1.62.0 1.62.0+dfsg-4+b2 amd64 +libboost-iostreams1.62.0 1.62.0+dfsg-4+b2 amd64 +libboost-system1.62.0 1.62.0+dfsg-4+b2 amd64 +libbsd0 0.8.6-3 amd64 -libcap-ng0 0.7.7-3+b1 amd64 +libcap-ng0 0.7.7-3.1+b1 amd64 -libcc1-0 7.2.0-8 amd64 -libcilkrts5 7.2.0-8 amd64 +libcc1-0 7.2.0-12 amd64 +libcilkrts5 7.2.0-12 amd64 -libcomerr2 1.43.6-1 amd64 +libcomerr2 1.43.7-1 amd64 -libcurl3-gnutls 7.55.1-1 amd64 +libcurl3-gnutls 7.56.1-1 amd64 -libdbus-1-3 1.11.20-1 amd64 -libdebconfclient0 0.230 amd64 -libdevmapper-event1.02.1 2:1.02.142-1 amd64 -libdevmapper1.02.1 2:1.02.142-1 amd64 +libdbus-1-3 1.12.0-1 amd64 +libdebconfclient0 0.232 amd64 +libdevmapper-event1.02.1 2:1.02.145-1 amd64 +libdevmapper1.02.1 2:1.02.145-1 amd64 +libdns-export190 1:9.10.6+dfsg-5 amd64 -libdpkg-perl 1.18.24 all +libdns190 1:9.10.6+dfsg-5 amd64 +libdpkg-perl 1.19.0.4 all -libexpat1 2.2.3-1 amd64 +libexpat1 2.2.3-2 amd64 -libfastjson4 0.99.6-1 amd64 +libfastjson4 0.99.7-1 amd64 -libfreetype6 2.8-0.2 amd64 +libfreetype6 2.8.1-0.1 amd64 -libgcc-7-dev 7.2.0-8 amd64 -libgcc1 1:7.2.0-8 amd64 -libgcrypt20 1.7.9-1 amd64 +libgcc-7-dev 7.2.0-12 amd64 +libgcc1 1:7.2.0-12 amd64 +libgcrypt20 1.7.9-2 amd64 -libgnutls-openssl27 3.5.15-2 amd64 -libgnutls30 3.5.15-2 amd64 -libgomp1 7.2.0-8 amd64 -libgpg-error0 1.27-3 amd64 +libgnutls-openssl27 3.5.16-1 amd64 +libgnutls30 3.5.16-1 amd64 +libgomp1 7.2.0-12 amd64 +libgpg-error0 1.27-4 amd64 -libgssapi-krb5-2 1.15.1-2 amd64 +libgssapi-krb5-2 1.15.2-2 amd64 -libicu57 57.1-6 amd64 +libicu57 57.1-8 amd64 -libip4tc0 1.6.1-2 amd64 -libip6tc0 1.6.1-2 amd64 -libiptc0 1.6.1-2 amd64 +libip4tc0 1.6.1-2+b1 amd64 +libip6tc0 1.6.1-2+b1 amd64 +libiptc0 1.6.1-2+b1 amd64 +libisc-export189 1:9.10.6+dfsg-5 amd64 -libisccc140 1:9.10.3.dfsg.P4-12.6 amd64 +libisc189 1:9.10.6+dfsg-5 amd64 +libisccc140 1:9.10.6+dfsg-5 amd64 +libisccfg144 1:9.10.6+dfsg-5 amd64 -libitm1 7.2.0-8 amd64 +libitm1 7.2.0-12 amd64 -libjs-sphinxdoc 1.6.4-2 all +libjs-sphinxdoc 1.6.5-2 all -libjson-glib-1.0-0 1.2.8-1 amd64 -libjson-glib-1.0-common 1.2.8-1 all -libk5crypto3 1.15.1-2 amd64 +libjson-c3 0.12.1-1.2 amd64 +libjson-glib-1.0-0 1.4.2-2 amd64 +libjson-glib-1.0-common 1.4.2-2 all +libk5crypto3 1.15.2-2 amd64 -libkrb5-3 1.15.1-2 amd64 -libkrb5support0 1.15.1-2 amd64 +libkrb5-3 1.15.2-2 amd64 +libkrb5support0 1.15.2-2 amd64 -liblsan0 7.2.0-8 amd64 +liblsan0 7.2.0-12 amd64 -liblvm2app2.2 2.02.173-1 amd64 -liblvm2cmd2.02 2.02.173-1 amd64 -liblwres141 1:9.10.3.dfsg.P4-12.6 amd64 +liblvm2app2.2 2.02.176-1 amd64 +liblvm2cmd2.02 2.02.176-1 amd64 +liblwres141 1:9.10.6+dfsg-5 amd64 -libmbim-glib4 1.14.2-1 amd64 -libmbim-proxy 1.14.2-1 amd64 -libmm-glib0 1.6.8-1 amd64 +libmbim-glib4 1.14.2-2 amd64 +libmbim-proxy 1.14.2-2 amd64 +libmm-glib0 1.6.8-2 amd64 -libmpx2 7.2.0-8 amd64 +libmpx2 7.2.0-12 amd64 -libnghttp2-14 1.26.0-1 amd64 +libnghttp2-14 1.27.0-1 amd64 -libnm0 1.8.4-3 amd64 +libnm0 1.8.4-4 amd64 -libp11-kit0 0.23.7-3 amd64 +libp11-kit0 0.23.9-2 amd64 -libperl5.26 5.26.0-8 amd64 +libperl5.26 5.26.1-2 amd64 -libpython-stdlib 2.7.13-2 amd64 -libpython2.7 2.7.13-2 amd64 -libpython2.7-minimal 2.7.13-2 amd64 -libpython2.7-stdlib 2.7.13-2 amd64 -libpython3-stdlib 3.5.3-3 amd64 -libpython3.5-minimal 3.5.4-2 amd64 -libpython3.5-stdlib 3.5.4-2 amd64 -libpython3.6-minimal 3.6.2-2 amd64 -libpython3.6-stdlib 3.6.2-2 amd64 -libqmi-glib5 1.18.0-2 amd64 -libqmi-proxy 1.18.0-2 amd64 -libquadmath0 7.2.0-8 amd64 +libpython-stdlib 2.7.14-1 amd64 +libpython2.7 2.7.14-2 amd64 +libpython2.7-minimal 2.7.14-2 amd64 +libpython2.7-stdlib 2.7.14-2 amd64 +libpython3-stdlib 3.6.3-2 amd64 +libpython3.5-minimal 3.5.4-4 amd64 +libpython3.5-stdlib 3.5.4-4 amd64 +libpython3.6-minimal 3.6.3-1 amd64 +libpython3.6-stdlib 3.6.3-1 amd64 +libqmi-glib5 1.18.0-3 amd64 +libqmi-proxy 1.18.0-3 amd64 +libquadmath0 7.2.0-12 amd64 -libsqlite3-0 3.20.1-1 amd64 -libss2 1.43.6-1 amd64 +libsqlite3-0 3.21.0-1 amd64 +libss2 1.43.7-1 amd64 -libssl1.0.2 1.0.2l-2 amd64 -libssl1.1 1.1.0f-5 amd64 -libstdc++-7-dev 7.2.0-8 amd64 -libstdc++6 7.2.0-8 amd64 +libssl1.0.2 1.0.2m-3 amd64 +libssl1.1 1.1.0g-2 amd64 +libstdc++-7-dev 7.2.0-12 amd64 +libstdc++6 7.2.0-12 amd64 +libtomcrypt1 1.18.0-1 amd64 -libtsan0 7.2.0-8 amd64 -libubsan0 7.2.0-8 amd64 +libtsan0 7.2.0-12 amd64 +libubsan0 7.2.0-12 amd64 -libwrap0 7.6.q-26 amd64 +libwrap0 7.6.q-27 amd64 -libxapian30 1.4.4-3 amd64 +libxapian30 1.4.5-1 amd64 -libxml2 2.9.4+dfsg1-4 amd64 +libxml2 2.9.4+dfsg1-5+b1 amd64 -libxtables12 1.6.1-2 amd64 +libxtables12 1.6.1-2+b1 amd64 -lvm2 2.02.173-1 amd64 +lvm2 2.02.176-1 amd64 -manpages-de 2.1-1 all +manpages-de 2.2-1 all -modemmanager 1.6.8-1 amd64 +modemmanager 1.6.8-2 amd64 -network-manager 1.8.4-3 amd64 +network-manager 1.8.4-4 amd64 -openssl 1.1.0f-5 amd64 +openssl 1.1.0g-2 amd64 -perl 5.26.0-8 amd64 -perl-base 5.26.0-8 amd64 +perl 5.26.1-2 amd64 +perl-base 5.26.1-2 amd64 -perl-modules-5.26 5.26.0-8 all +perl-modules-5.26 5.26.1-2 all -python 2.7.13-2 amd64 +python 2.7.14-1 amd64 -python-certifi 2017.4.17-2 all +python-certifi 2017.7.27.1-2 all -python-ipython 5.1.0-3 all +python-ipython 5.5.0-1 all -python-minimal 2.7.13-2 amd64 +python-minimal 2.7.14-1 amd64 -python-pkg-resources 36.2.7-2 all +python-pkg-resources 36.6.0-1 all -python-setuptools 36.2.7-2 all +python-setuptools 36.6.0-1 all -python-tornado 4.5.1-2+b1 amd64 +python-tornado 4.5.2-1 amd64 -python2.7 2.7.13-2 amd64 -python2.7-minimal 2.7.13-2 amd64 -python3 3.5.3-3 amd64 -python3-all 3.5.3-3 amd64 +python2.7 2.7.14-2 amd64 +python2.7-minimal 2.7.14-2 amd64 +python3 3.6.3-2 amd64 +python3-all 3.6.3-2 amd64 -python3-certifi 2017.4.17-2 all +python3-certifi 2017.7.27.1-2 all +python3-debconf 1.5.64 all -python3-debianbts 2.6.3 all +python3-debianbts 2.7.1 all -python3-ipython 5.1.0-3 all +python3-ipython 5.5.0-1 all -python3-minimal 3.5.3-3 amd64 +python3-minimal 3.6.3-2 amd64 -python3-pkg-resources 36.2.7-2 all +python3-pkg-resources 36.6.0-1 all -python3-setuptools 36.2.7-2 all +python3-setuptools 36.6.0-1 all -python3.5 3.5.4-2 amd64 -python3.5-minimal 3.5.4-2 amd64 -python3.6 3.6.2-2 amd64 -python3.6-minimal 3.6.2-2 amd64 +python3.5 3.5.4-4 amd64 +python3.5-minimal 3.5.4-4 amd64 +python3.6 3.6.3-1 amd64 +python3.6-minimal 3.6.3-1 amd64 -strace 4.15-2 amd64 +strace 4.19-1 amd64 -task-german 3.41 all -task-ssh-server 3.41 all -tasksel 3.41 all -tasksel-data 3.41 all -tcpd 7.6.q-26 amd64 +task-german 3.42 all +task-ssh-server 3.42 all +tasksel 3.42 all +tasksel-data 3.42 all +tcpd 7.6.q-27 amd64 -tzdata 2017b-2 all +tzdata 2017c-1 all -wamerican 2017.01.22-1 all -wget 1.19.1-4 amd64 +wamerican 2017.08.24-1 all +wget 1.19.2-1 amd64 -wngerman 20161207-1 all +wngerman 20161207-3 all -zsh 5.4.2-1 amd64 -zsh-common 5.4.2-1 all +zsh 5.4.2-2 amd64 +zsh-common 5.4.2-2 all --- diff --git a/.etckeeper b/.etckeeper index 3016ee7..e4bcbcd 100755 --- a/.etckeeper +++ b/.etckeeper @@ -426,6 +426,7 @@ maybe chmod 0640 'logcheck/ignore.d.server/ssmtp' maybe chmod 0644 'login.defs' maybe chmod 0644 'logrotate.conf' maybe chmod 0755 'logrotate.d' +maybe chmod 0644 'logrotate.d/alternatives' maybe chmod 0644 'logrotate.d/apt' maybe chmod 0644 'logrotate.d/aptitude' maybe chmod 0644 'logrotate.d/chrony' @@ -437,6 +438,15 @@ maybe chmod 0755 'lvm' maybe chmod 0700 'lvm/backup' maybe chmod 0600 'lvm/backup/vg0' maybe chmod 0644 'lvm/lvm.conf' +maybe chmod 0644 'lvm/lvmlocal.conf' +maybe chmod 0755 'lvm/profile' +maybe chmod 0644 'lvm/profile/cache-mq.profile' +maybe chmod 0644 'lvm/profile/cache-smq.profile' +maybe chmod 0644 'lvm/profile/command_profile_template.profile' +maybe chmod 0644 'lvm/profile/lvmdbusd.profile' +maybe chmod 0644 'lvm/profile/metadata_profile_template.profile' +maybe chmod 0644 'lvm/profile/thin-generic.profile' +maybe chmod 0644 'lvm/profile/thin-performance.profile' maybe chmod 0444 'machine-id' maybe chmod 0644 'magic' maybe chmod 0644 'magic.mime' @@ -458,14 +468,12 @@ maybe chmod 0644 'mysql/my.cnf.fallback' maybe chmod 0644 'nanorc' maybe chmod 0755 'network' maybe chmod 0755 'network/if-down.d' -maybe chmod 0755 'network/if-down.d/upstart' maybe chmod 0755 'network/if-post-down.d' maybe chmod 0755 'network/if-post-down.d/chrony' maybe chmod 0755 'network/if-pre-up.d' maybe chmod 0755 'network/if-up.d' maybe chmod 0755 'network/if-up.d/chrony' maybe chmod 0755 'network/if-up.d/openssh-server' -maybe chmod 0755 'network/if-up.d/upstart' maybe chmod 0644 'network/interfaces' maybe chmod 0755 'network/interfaces.d' maybe chmod 0644 'networks' diff --git a/alternatives/README b/alternatives/README index 54ef740..4c4d215 100644 --- a/alternatives/README +++ b/alternatives/README @@ -1,2 +1,2 @@ -Please read the update-alternatives(8) man page for information on this +Please read the update-alternatives(1) man page for information on this directory and its contents. diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh index 30b46c1..e57d96d 100755 --- a/console-setup/cached_setup_keyboard.sh +++ b/console-setup/cached_setup_keyboard.sh @@ -10,4 +10,4 @@ kbd_mode '-u' < '/dev/tty3' kbd_mode '-u' < '/dev/tty4' kbd_mode '-u' < '/dev/tty5' kbd_mode '-u' < '/dev/tty6' -loadkeys '/etc/console-setup/cached_UTF-8_del.kmap.gz' > '/dev/null' +loadkeys '/tmp/tmpkbd.MJz2Gs' > '/dev/null' diff --git a/cron.daily/dpkg b/cron.daily/dpkg index c0aefb8..0a6b05e 100755 --- a/cron.daily/dpkg +++ b/cron.daily/dpkg @@ -25,17 +25,6 @@ if cd /var/backups ; then # The alternatives database is independent from the dpkg database. dbalt=alternatives - # Switch the alternatives database backups from xz to gzip, as the latter - # is Essential and we can rely on it being always present, using xz here - # is not worth the trouble, disk space savings, or possible additional - # dependencies. - for dbseq in `seq 1 6` ; do - dbfile=${dbalt}.tar.${dbseq} - [ -e "${dbfile}.xz" ] || continue - unxz ${dbfile}.xz - gzip -9 $dbfile - done - # XXX: Ideally we'd use --warning=none instead of discarding stderr, but # as of GNU tar 1.27.1, it does not seem to work reliably (see #749307). if ! test -e ${dbalt}.tar.0 || diff --git a/init.d/networking b/init.d/networking index 2827846..b538051 100755 --- a/init.d/networking +++ b/init.d/networking @@ -119,9 +119,6 @@ ifup_hotplug () { case "$1" in start) - if init_is_upstart; then - exit 1 - fi process_options check_ifstate @@ -147,9 +144,6 @@ start) ;; stop) - if init_is_upstart; then - exit 0 - fi check_network_file_systems check_network_swap @@ -162,9 +156,6 @@ stop) ;; reload) - if init_is_upstart; then - exit 1 - fi process_options log_action_begin_msg "Reloading network interfaces configuration" @@ -178,9 +169,6 @@ reload) ;; force-reload|restart) - if init_is_upstart; then - exit 1 - fi process_options log_warning_msg "Running $0 $1 is deprecated because it may not re-enable some interfaces" diff --git a/logrotate.d/alternatives b/logrotate.d/alternatives new file mode 100644 index 0000000..41c8a9c --- /dev/null +++ b/logrotate.d/alternatives @@ -0,0 +1,9 @@ +/var/log/alternatives.log { + monthly + rotate 12 + compress + delaycompress + missingok + notifempty + create 644 root root +} diff --git a/lvm/backup/vg0 b/lvm/backup/vg0 index bd51360..43d2649 100644 --- a/lvm/backup/vg0 +++ b/lvm/backup/vg0 @@ -1,12 +1,12 @@ -# Generated by LVM2 version 2.02.173(2) (2017-07-20): Tue Sep 5 22:44:01 2017 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Sat Nov 11 17:34:04 2017 contents = "Text Format Volume Group" version = 1 description = "Created *after* executing 'vgcfgbackup'" -creation_host = "vera" # Linux vera 4.11.0-1-amd64 #1 SMP Debian 4.11.6-1 (2017-06-19) x86_64 -creation_time = 1504644241 # Tue Sep 5 22:44:01 2017 +creation_host = "vera" # Linux vera 4.13.0-1-amd64 #1 SMP Debian 4.13.4-2 (2017-10-15) x86_64 +creation_time = 1510418044 # Sat Nov 11 17:34:04 2017 vg0 { id = "sgOzk7-ieDy-pTI5-Mkmg-PG8K-j6qa-e0Yddp" diff --git a/lvm/lvmlocal.conf b/lvm/lvmlocal.conf new file mode 100644 index 0000000..2fe6446 --- /dev/null +++ b/lvm/lvmlocal.conf @@ -0,0 +1,57 @@ +# This is a local configuration file template for the LVM2 system +# which should be installed as /etc/lvm/lvmlocal.conf . +# +# Refer to 'man lvm.conf' for information about the file layout. +# +# To put this file in a different directory and override +# /etc/lvm set the environment variable LVM_SYSTEM_DIR before +# running the tools. +# +# The lvmlocal.conf file is normally expected to contain only the +# "local" section which contains settings that should not be shared or +# repeated among different hosts. (But if other sections are present, +# they *will* get processed. Settings in this file override equivalent +# ones in lvm.conf and are in turn overridden by ones in any enabled +# lvm_.conf files.) +# +# Please take care that each setting only appears once if uncommenting +# example settings in this file and never copy this file between hosts. + + +# Configuration section local. +# LVM settings that are specific to the local host. +local { + + # Configuration option local/system_id. + # Defines the local system ID for lvmlocal mode. + # This is used when global/system_id_source is set to 'lvmlocal' in the + # main configuration file, e.g. lvm.conf. When used, it must be set to + # a unique value among all hosts sharing access to the storage, + # e.g. a host name. + # + # Example + # Set no system ID: + # system_id = "" + # Set the system_id to a specific name: + # system_id = "host1" + # + # This configuration option has an automatic default value. + # system_id = "" + + # Configuration option local/extra_system_ids. + # A list of extra VG system IDs the local host can access. + # VGs with the system IDs listed here (in addition to the host's own + # system ID) can be fully accessed by the local host. (These are + # system IDs that the host sees in VGs, not system IDs that identify + # the local host, which is determined by system_id_source.) + # Use this only after consulting 'man lvmsystemid' to be certain of + # correct usage and possible dangers. + # This configuration option does not have a default value defined. + + # Configuration option local/host_id. + # The lvmlockd sanlock host_id. + # This must be unique among all hosts, and must be between 1 and 2000. + # Applicable only if LVM is compiled with lockd support + # This configuration option has an automatic default value. + # host_id = 0 +} diff --git a/lvm/profile/cache-mq.profile b/lvm/profile/cache-mq.profile new file mode 100644 index 0000000..3c90331 --- /dev/null +++ b/lvm/profile/cache-mq.profile @@ -0,0 +1,20 @@ +# Demo configuration 'mq' cache policy +# +# Note: This policy has been deprecated in favor of the smq policy +# keyword "default" means, setting is left with kernel defaults. +# + +allocation { + cache_pool_chunk_size = 64 + cache_mode = "writethrough" + cache_policy = "mq" + cache_settings { + mq { + sequential_threshold = "default" # #nr_sequential_ios + random_threshold = "default" # #nr_random_ios + read_promote_adjustment = "default" + write_promote_adjustment = "default" + discard_promote_adjustment = "default" + } + } +} diff --git a/lvm/profile/cache-smq.profile b/lvm/profile/cache-smq.profile new file mode 100644 index 0000000..c457481 --- /dev/null +++ b/lvm/profile/cache-smq.profile @@ -0,0 +1,14 @@ +# Demo configuration 'smq' cache policy +# +# The stochastic multi-queue (smq) policy addresses some of the problems +# with the multiqueue (mq) policy and uses less memory. +# + +allocation { + cache_pool_chunk_size = 64 + cache_mode = "writethrough" + cache_policy = "smq" + cache_settings { + # currently no settings for "smq" policy + } +} diff --git a/lvm/profile/command_profile_template.profile b/lvm/profile/command_profile_template.profile new file mode 100644 index 0000000..bf56799 --- /dev/null +++ b/lvm/profile/command_profile_template.profile @@ -0,0 +1,74 @@ +# This is a command profile template for the LVM2 system. +# +# It contains all configuration settings that are customizable by command +# profiles. To create a new command profile, select the settings you want +# to customize and add them in a new file named .profile. +# Then install the new profile in a directory as defined by config/profile_dir +# setting found in /etc/lvm/lvm.conf file. +# +# Command profiles can be referenced by using the --commandprofile option then. +# +# Refer to 'man lvm.conf' for further information about profiles and +# general configuration file layout. +# +allocation { + cache_mode="writethrough" + cache_settings { + } +} +log { + report_command_log=0 + command_log_sort="log_seq_num" + command_log_cols="log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code" + command_log_selection="!(log_type=status && message=success)" +} +global { + units="h" + si_unit_consistency=1 + suffix=1 + lvdisplay_shows_full_device_path=0 +} +report { + output_format="basic" + compact_output=0 + compact_output_cols="" + aligned=1 + buffered=1 + headings=1 + separator=" " + list_item_separator="," + prefixes=0 + quoted=1 + columns_as_rows=0 + binary_values_as_numeric=0 + time_format="%Y-%m-%d %T %z" + devtypes_sort="devtype_name" + devtypes_cols="devtype_name,devtype_max_partitions,devtype_description" + devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description" + lvs_sort="vg_name,lv_name" + lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv" + lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile" + vgs_sort="vg_name" + vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free" + vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile" + pvs_sort="pv_name" + pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free" + pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid" + segs_sort="vg_name,lv_name,seg_start" + segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size" + segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize" + pvsegs_sort="pv_name,pvseg_start" + pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size" + pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges" + vgs_cols_full="vg_all" + pvs_cols_full="pv_all" + lvs_cols_full="lv_all" + pvsegs_cols_full="pvseg_all,pv_uuid,lv_uuid" + segs_cols_full="seg_all,lv_uuid" + vgs_sort_full="vg_name" + pvs_sort_full="pv_name" + lvs_sort_full="vg_name,lv_name" + pvsegs_sort_full="pv_uuid,pvseg_start" + segs_sort_full="lv_uuid,seg_start" + mark_hidden_devices=1 +} diff --git a/lvm/profile/lvmdbusd.profile b/lvm/profile/lvmdbusd.profile new file mode 100644 index 0000000..2cdc6da --- /dev/null +++ b/lvm/profile/lvmdbusd.profile @@ -0,0 +1,50 @@ +# +# DO NOT EDIT THIS FILE! +# +# LVM configuration profile used by lvmdbusd daemon. +# +# This sets up LVM to produce output in the most suitable format for processing +# by lvmdbusd daemon which utilizes LVM shell to execute LVM commands. +# +# Do not edit this file in any way. This profile is distributed together with +# lvmdbusd and it contains configuration that is important for lvmdbusd to +# cooperate and interface with LVM correctly. +# + +global { + # use bytes for expected and deterministic output + units=b + # no need for suffix if we have units set + suffix=0 +} + +report { + compact_output=0 + compact_output_cols="" + binary_values_as_numeric=0 + # time in number of seconds since the Epoch + time_format="%s" + mark_hidden_devices=1 + # lvmdbusd expects JSON output + output_format=json + # *_cols_full for lvm fullreport's fields which lvmdbusd relies on to update its state + vgs_cols_full="vg_name,vg_uuid,vg_fmt,vg_size,vg_free,vg_sysid,vg_extent_size,vg_extent_count,vg_free_count,vg_profile,max_lv,max_pv,pv_count,lv_count,snap_count,vg_seqno,vg_mda_count,vg_mda_free,vg_mda_size,vg_mda_used_count,vg_attr,vg_tags" + pvs_cols_full="pv_name,pv_uuid,pv_fmt,pv_size,pv_free,pv_used,dev_size,pv_mda_size,pv_mda_free,pv_ba_start,pv_ba_size,pe_start,pv_pe_count,pv_pe_alloc_count,pv_attr,pv_tags,vg_name,vg_uuid" + lvs_cols_full="lv_uuid,lv_name,lv_path,lv_size,vg_name,pool_lv_uuid,pool_lv,origin_uuid,origin,data_percent,lv_attr,lv_tags,vg_uuid,lv_active,data_lv,metadata_lv,lv_parent,lv_role,lv_layout" + pvsegs_cols_full="pvseg_start,pvseg_size,segtype,pv_uuid,lv_uuid,pv_name" + segs_cols_full="seg_pe_ranges,segtype,lv_uuid" + vgs_sort_full="vg_name" + pvs_sort_full="pv_name" + lvs_sort_full="vg_name,lv_name" + pvsegs_sort_full="pv_uuid,pvseg_start" + segs_sort_full="lv_uuid,seg_start" +} + +log { + # lvmdbusd relies on command log report to inspect LVM command's execution status + report_command_log=1 + # display only outermost LVM shell-related log that lvmdbusd inspects first after LVM command execution (it calls 'lastlog' for more detailed log afterwards if needed) + command_log_selection="log_context=shell" + command_log_cols="log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code" + command_log_sort="log_seq_num" +} diff --git a/lvm/profile/metadata_profile_template.profile b/lvm/profile/metadata_profile_template.profile new file mode 100644 index 0000000..5836a63 --- /dev/null +++ b/lvm/profile/metadata_profile_template.profile @@ -0,0 +1,24 @@ +# This is a metadata profile template for the LVM2 system. +# +# It contains all configuration settings that are customizable by metadata +# profiles. To create a new metadata profile, select the settings you want +# to customize and add them in a new file named .profile. +# Then install the new profile in a directory as defined by config/profile_dir +# setting found in /etc/lvm/lvm.conf file. +# +# Metadata profiles can be referenced by using the --metadataprofile LVM2 +# command line option. +# +# Refer to 'man lvm.conf' for further information about profiles and +# general configuration file layout. +# +allocation { + thin_pool_zero=1 + thin_pool_discards="passdown" + thin_pool_chunk_size_policy="generic" +# thin_pool_chunk_size=128 +} +activation { + thin_pool_autoextend_threshold=100 + thin_pool_autoextend_percent=20 +} diff --git a/lvm/profile/thin-generic.profile b/lvm/profile/thin-generic.profile new file mode 100644 index 0000000..229a7fc --- /dev/null +++ b/lvm/profile/thin-generic.profile @@ -0,0 +1,4 @@ +allocation { + thin_pool_chunk_size_policy = "generic" + thin_pool_zero = 1 +} diff --git a/lvm/profile/thin-performance.profile b/lvm/profile/thin-performance.profile new file mode 100644 index 0000000..2914de2 --- /dev/null +++ b/lvm/profile/thin-performance.profile @@ -0,0 +1,4 @@ +allocation { + thin_pool_chunk_size_policy = "performance" + thin_pool_zero = 0 +} diff --git a/network/if-down.d/upstart b/network/if-down.d/upstart deleted file mode 100755 index 51e20b3..0000000 --- a/network/if-down.d/upstart +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e - -if [ -e /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions -fi - -if ! init_is_upstart; then - exit 0 -fi - -# Let's ignore meta entries (ifdown -a) -if [ "$ADDRFAM" = "meta" ]; then - exit 0 -fi - -initctl emit -n net-device-down \ - "IFACE=$IFACE" \ - "LOGICAL=$LOGICAL" \ - "ADDRFAM=$ADDRFAM" \ - "METHOD=$METHOD" diff --git a/network/if-up.d/upstart b/network/if-up.d/upstart deleted file mode 100755 index 8690c86..0000000 --- a/network/if-up.d/upstart +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -e -MARK_DEV_PREFIX="/run/network/ifup." -MARK_STATIC_NETWORK_EMITTED="/run/network/static-network-up-emitted" - -if [ -e /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions -fi - -if ! init_is_upstart; then - exit 0 -fi - -# Let's ignore meta entries (ifup -a) -if [ "$ADDRFAM" = "meta" ]; then - exit 0 -fi - -# lo emission handled by /etc/init/network-interface.conf -if [ "$IFACE" != lo ]; then - initctl emit -n net-device-up \ - "IFACE=$IFACE" \ - "LOGICAL=$LOGICAL" \ - "ADDRFAM=$ADDRFAM" \ - "METHOD=$METHOD" -fi - -get_auto_interfaces() { - # write to stdout a list of interfaces configured as 'auto' in interfaces(5) - local found="" - # stderr redirected as it outputs things like: - # Ignoring unknown interface eth0=eth0. - found=$(ifquery --list --allow auto 2>/dev/null) || return - set -- ${found} - echo "$@" -} - -all_interfaces_up() { - # return true if all interfaces listed in /etc/network/interfaces as 'auto' - # are up. if no interfaces are found there, then "all [given] were up" - local prefix="$1" iface="" - for iface in $(get_auto_interfaces); do - # if cur interface does is not up, then all have not been brought up - [ -f "${prefix}${iface}" ] || return 1 - done - return 0 -} - -# touch our own "marker" indicating that this interface has been brought up. -: > "${MARK_DEV_PREFIX}$IFACE" - -if all_interfaces_up "${MARK_DEV_PREFIX}" && - mkdir "${MARK_STATIC_NETWORK_EMITTED}" 2>/dev/null; then - initctl emit --no-wait static-network-up -fi diff --git a/systemd/system/sysinit.target.wants/blk-availability.service b/systemd/system/sysinit.target.wants/blk-availability.service new file mode 120000 index 0000000..3af3fda --- /dev/null +++ b/systemd/system/sysinit.target.wants/blk-availability.service @@ -0,0 +1 @@ +/lib/systemd/system/blk-availability.service \ No newline at end of file