From 037066598afb3baa17a7000dba43b0d63002619c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 3 Nov 2013 21:07:56 +0100 Subject: Updating file suffixes of the internal default hooks. --- share/hooks/0010-disable-kexec-tools.chroot | 16 ---------------- share/hooks/0010-disable-kexec-tools.hook.chroot | 16 ++++++++++++++++ share/hooks/0100-remove-adjtime-configuration.chroot | 11 ----------- .../0100-remove-adjtime-configuration.hook.chroot | 11 +++++++++++ share/hooks/0110-remove-backup-files.chroot | 18 ------------------ share/hooks/0110-remove-backup-files.hook.chroot | 18 ++++++++++++++++++ share/hooks/0120-remove-dbus-machine-id.chroot | 9 --------- share/hooks/0120-remove-dbus-machine-id.hook.chroot | 9 +++++++++ share/hooks/0130-remove-gnome-icon-cache.chroot | 9 --------- share/hooks/0130-remove-gnome-icon-cache.hook.chroot | 9 +++++++++ share/hooks/0140-remove-log-files.chroot | 9 --------- share/hooks/0140-remove-log-files.hook.chroot | 9 +++++++++ share/hooks/0150-remove-mdadm-configuration.chroot | 7 ------- .../hooks/0150-remove-mdadm-configuration.hook.chroot | 7 +++++++ .../hooks/0160-remove-openssh-server-host-keys.chroot | 10 ---------- .../0160-remove-openssh-server-host-keys.hook.chroot | 10 ++++++++++ share/hooks/0170-remove-python-py.chroot | 9 --------- share/hooks/0170-remove-python-py.hook.chroot | 9 +++++++++ share/hooks/0180-remove-systemd-machine-id.chroot | 9 --------- share/hooks/0180-remove-systemd-machine-id.hook.chroot | 9 +++++++++ share/hooks/0190-remove-temporary-files.chroot | 14 -------------- share/hooks/0190-remove-temporary-files.hook.chroot | 14 ++++++++++++++ share/hooks/0195-remove-ssl-cert-snakeoil.chroot | 13 ------------- share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot | 13 +++++++++++++ .../hooks/0200-remove-udev-persistent-cd-rules.chroot | 13 ------------- .../0200-remove-udev-persistent-cd-rules.hook.chroot | 13 +++++++++++++ .../hooks/0300-remove-udev-persistent-net-rules.chroot | 16 ---------------- .../0300-remove-udev-persistent-net-rules.hook.chroot | 16 ++++++++++++++++ share/hooks/0400-update-apt-file-cache.chroot | 14 -------------- share/hooks/0400-update-apt-file-cache.hook.chroot | 14 ++++++++++++++ share/hooks/0410-update-apt-xapian-index.chroot | 14 -------------- share/hooks/0410-update-apt-xapian-index.hook.chroot | 14 ++++++++++++++ share/hooks/0420-update-glx-alternative.chroot | 9 --------- share/hooks/0420-update-glx-alternative.hook.chroot | 9 +++++++++ share/hooks/0430-update-mlocate-database.chroot | 14 -------------- share/hooks/0430-update-mlocate-database.hook.chroot | 14 ++++++++++++++ share/hooks/0440-update-nvidia-alternative.chroot | 9 --------- share/hooks/0440-update-nvidia-alternative.hook.chroot | 9 +++++++++ share/hooks/0910-remove-apt-sources-lists | 8 ++++++++ share/hooks/0910-remove-apt-sources-lists.chroot | 8 -------- 40 files changed, 231 insertions(+), 231 deletions(-) delete mode 100755 share/hooks/0010-disable-kexec-tools.chroot create mode 100755 share/hooks/0010-disable-kexec-tools.hook.chroot delete mode 100755 share/hooks/0100-remove-adjtime-configuration.chroot create mode 100755 share/hooks/0100-remove-adjtime-configuration.hook.chroot delete mode 100755 share/hooks/0110-remove-backup-files.chroot create mode 100755 share/hooks/0110-remove-backup-files.hook.chroot delete mode 100755 share/hooks/0120-remove-dbus-machine-id.chroot create mode 100755 share/hooks/0120-remove-dbus-machine-id.hook.chroot delete mode 100755 share/hooks/0130-remove-gnome-icon-cache.chroot create mode 100755 share/hooks/0130-remove-gnome-icon-cache.hook.chroot delete mode 100755 share/hooks/0140-remove-log-files.chroot create mode 100755 share/hooks/0140-remove-log-files.hook.chroot delete mode 100755 share/hooks/0150-remove-mdadm-configuration.chroot create mode 100755 share/hooks/0150-remove-mdadm-configuration.hook.chroot delete mode 100755 share/hooks/0160-remove-openssh-server-host-keys.chroot create mode 100755 share/hooks/0160-remove-openssh-server-host-keys.hook.chroot delete mode 100755 share/hooks/0170-remove-python-py.chroot create mode 100755 share/hooks/0170-remove-python-py.hook.chroot delete mode 100755 share/hooks/0180-remove-systemd-machine-id.chroot create mode 100755 share/hooks/0180-remove-systemd-machine-id.hook.chroot delete mode 100755 share/hooks/0190-remove-temporary-files.chroot create mode 100755 share/hooks/0190-remove-temporary-files.hook.chroot delete mode 100755 share/hooks/0195-remove-ssl-cert-snakeoil.chroot create mode 100755 share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot delete mode 100755 share/hooks/0200-remove-udev-persistent-cd-rules.chroot create mode 100755 share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot delete mode 100755 share/hooks/0300-remove-udev-persistent-net-rules.chroot create mode 100755 share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot delete mode 100755 share/hooks/0400-update-apt-file-cache.chroot create mode 100755 share/hooks/0400-update-apt-file-cache.hook.chroot delete mode 100755 share/hooks/0410-update-apt-xapian-index.chroot create mode 100755 share/hooks/0410-update-apt-xapian-index.hook.chroot delete mode 100755 share/hooks/0420-update-glx-alternative.chroot create mode 100755 share/hooks/0420-update-glx-alternative.hook.chroot delete mode 100755 share/hooks/0430-update-mlocate-database.chroot create mode 100755 share/hooks/0430-update-mlocate-database.hook.chroot delete mode 100755 share/hooks/0440-update-nvidia-alternative.chroot create mode 100755 share/hooks/0440-update-nvidia-alternative.hook.chroot create mode 100755 share/hooks/0910-remove-apt-sources-lists delete mode 100755 share/hooks/0910-remove-apt-sources-lists.chroot (limited to 'share') diff --git a/share/hooks/0010-disable-kexec-tools.chroot b/share/hooks/0010-disable-kexec-tools.chroot deleted file mode 100755 index 403d1d413..000000000 --- a/share/hooks/0010-disable-kexec-tools.chroot +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -# Disable kexec-tools - -if [ -e /sbin/kexec ] -then - echo "kexec-tools kexec-tools/load_kexec boolean false" > /root/preseed - - debconf-set-selections /root/preseed - - rm -f /root/preseed - - dpkg-reconfigure kexec-tools -fi diff --git a/share/hooks/0010-disable-kexec-tools.hook.chroot b/share/hooks/0010-disable-kexec-tools.hook.chroot new file mode 100755 index 000000000..403d1d413 --- /dev/null +++ b/share/hooks/0010-disable-kexec-tools.hook.chroot @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +# Disable kexec-tools + +if [ -e /sbin/kexec ] +then + echo "kexec-tools kexec-tools/load_kexec boolean false" > /root/preseed + + debconf-set-selections /root/preseed + + rm -f /root/preseed + + dpkg-reconfigure kexec-tools +fi diff --git a/share/hooks/0100-remove-adjtime-configuration.chroot b/share/hooks/0100-remove-adjtime-configuration.chroot deleted file mode 100755 index 7fe5bbd15..000000000 --- a/share/hooks/0100-remove-adjtime-configuration.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -# Reset generated file - -cat > /etc/adjtime << EOF -0.0 0 0.0 -0 -UTC -EOF diff --git a/share/hooks/0100-remove-adjtime-configuration.hook.chroot b/share/hooks/0100-remove-adjtime-configuration.hook.chroot new file mode 100755 index 000000000..7fe5bbd15 --- /dev/null +++ b/share/hooks/0100-remove-adjtime-configuration.hook.chroot @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +# Reset generated file + +cat > /etc/adjtime << EOF +0.0 0 0.0 +0 +UTC +EOF diff --git a/share/hooks/0110-remove-backup-files.chroot b/share/hooks/0110-remove-backup-files.chroot deleted file mode 100755 index 55a6b75af..000000000 --- a/share/hooks/0110-remove-backup-files.chroot +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -# Remove backup files -rm -f /boot/*.bak -rm -f /boot/*.old-dkms - -rm -f /etc/apt/sources.list~ -rm -f /etc/apt/trusted.gpg~ - -rm -f /etc/passwd- -rm -f /etc/group- -rm -f /etc/shadow- -rm -f /etc/gshadow- - -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dpkg/*-old diff --git a/share/hooks/0110-remove-backup-files.hook.chroot b/share/hooks/0110-remove-backup-files.hook.chroot new file mode 100755 index 000000000..55a6b75af --- /dev/null +++ b/share/hooks/0110-remove-backup-files.hook.chroot @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +# Remove backup files +rm -f /boot/*.bak +rm -f /boot/*.old-dkms + +rm -f /etc/apt/sources.list~ +rm -f /etc/apt/trusted.gpg~ + +rm -f /etc/passwd- +rm -f /etc/group- +rm -f /etc/shadow- +rm -f /etc/gshadow- + +rm -f /var/cache/debconf/*-old +rm -f /var/lib/dpkg/*-old diff --git a/share/hooks/0120-remove-dbus-machine-id.chroot b/share/hooks/0120-remove-dbus-machine-id.chroot deleted file mode 100755 index 230099e46..000000000 --- a/share/hooks/0120-remove-dbus-machine-id.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Remove dbus machine id. -# -# This removes dbus machine id that cache that makes each system unique. - -rm -f /var/lib/dbus/machine-id diff --git a/share/hooks/0120-remove-dbus-machine-id.hook.chroot b/share/hooks/0120-remove-dbus-machine-id.hook.chroot new file mode 100755 index 000000000..230099e46 --- /dev/null +++ b/share/hooks/0120-remove-dbus-machine-id.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Remove dbus machine id. +# +# This removes dbus machine id that cache that makes each system unique. + +rm -f /var/lib/dbus/machine-id diff --git a/share/hooks/0130-remove-gnome-icon-cache.chroot b/share/hooks/0130-remove-gnome-icon-cache.chroot deleted file mode 100755 index ab35a1d68..000000000 --- a/share/hooks/0130-remove-gnome-icon-cache.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Remove GNOME icon cache. -# -# This saves space some space. - -rm -f /usr/share/icons/*/icon-theme.cache diff --git a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot b/share/hooks/0130-remove-gnome-icon-cache.hook.chroot new file mode 100755 index 000000000..ab35a1d68 --- /dev/null +++ b/share/hooks/0130-remove-gnome-icon-cache.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Remove GNOME icon cache. +# +# This saves space some space. + +rm -f /usr/share/icons/*/icon-theme.cache diff --git a/share/hooks/0140-remove-log-files.chroot b/share/hooks/0140-remove-log-files.chroot deleted file mode 100755 index f95e54686..000000000 --- a/share/hooks/0140-remove-log-files.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Truncate log files -for _FILE in $(find /var/log/ -type f) -do - : > ${_FILE} -done diff --git a/share/hooks/0140-remove-log-files.hook.chroot b/share/hooks/0140-remove-log-files.hook.chroot new file mode 100755 index 000000000..f95e54686 --- /dev/null +++ b/share/hooks/0140-remove-log-files.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Truncate log files +for _FILE in $(find /var/log/ -type f) +do + : > ${_FILE} +done diff --git a/share/hooks/0150-remove-mdadm-configuration.chroot b/share/hooks/0150-remove-mdadm-configuration.chroot deleted file mode 100755 index 206b494da..000000000 --- a/share/hooks/0150-remove-mdadm-configuration.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# Remove generated files - -rm -f /etc/mdadm/mdadm.conf diff --git a/share/hooks/0150-remove-mdadm-configuration.hook.chroot b/share/hooks/0150-remove-mdadm-configuration.hook.chroot new file mode 100755 index 000000000..206b494da --- /dev/null +++ b/share/hooks/0150-remove-mdadm-configuration.hook.chroot @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +# Remove generated files + +rm -f /etc/mdadm/mdadm.conf diff --git a/share/hooks/0160-remove-openssh-server-host-keys.chroot b/share/hooks/0160-remove-openssh-server-host-keys.chroot deleted file mode 100755 index 862704981..000000000 --- a/share/hooks/0160-remove-openssh-server-host-keys.chroot +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -# Remove OpenSSH Host Keys. -# -# This removes openssh-server host keys, they are regenerated by live-config -# on system start. - -rm -f /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub diff --git a/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot b/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot new file mode 100755 index 000000000..862704981 --- /dev/null +++ b/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Remove OpenSSH Host Keys. +# +# This removes openssh-server host keys, they are regenerated by live-config +# on system start. + +rm -f /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub diff --git a/share/hooks/0170-remove-python-py.chroot b/share/hooks/0170-remove-python-py.chroot deleted file mode 100755 index ff705838f..000000000 --- a/share/hooks/0170-remove-python-py.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Remove Python *.py files. -# -# This removes byte-compiled Python modules to save some space. - -find /usr -name "*.pyc" -print0 | xargs -0r rm -f diff --git a/share/hooks/0170-remove-python-py.hook.chroot b/share/hooks/0170-remove-python-py.hook.chroot new file mode 100755 index 000000000..ff705838f --- /dev/null +++ b/share/hooks/0170-remove-python-py.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Remove Python *.py files. +# +# This removes byte-compiled Python modules to save some space. + +find /usr -name "*.pyc" -print0 | xargs -0r rm -f diff --git a/share/hooks/0180-remove-systemd-machine-id.chroot b/share/hooks/0180-remove-systemd-machine-id.chroot deleted file mode 100755 index 52ba38fd4..000000000 --- a/share/hooks/0180-remove-systemd-machine-id.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Remove systemd machine id. -# -# This removes systemd machine id that cache that makes each system unique. - -rm -f /etc/machine-id diff --git a/share/hooks/0180-remove-systemd-machine-id.hook.chroot b/share/hooks/0180-remove-systemd-machine-id.hook.chroot new file mode 100755 index 000000000..52ba38fd4 --- /dev/null +++ b/share/hooks/0180-remove-systemd-machine-id.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Remove systemd machine id. +# +# This removes systemd machine id that cache that makes each system unique. + +rm -f /etc/machine-id diff --git a/share/hooks/0190-remove-temporary-files.chroot b/share/hooks/0190-remove-temporary-files.chroot deleted file mode 100755 index fd220e030..000000000 --- a/share/hooks/0190-remove-temporary-files.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# Remove temporary files -rm -rf /var/cache/man/* - -for _DIRECTORY in /tmp /var/tmp -do - rm -rf ${_DIRECTORY} - - mkdir -p ${_DIRECTORY} - chmod 1777 ${_DIRECTORY} -done diff --git a/share/hooks/0190-remove-temporary-files.hook.chroot b/share/hooks/0190-remove-temporary-files.hook.chroot new file mode 100755 index 000000000..fd220e030 --- /dev/null +++ b/share/hooks/0190-remove-temporary-files.hook.chroot @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Remove temporary files +rm -rf /var/cache/man/* + +for _DIRECTORY in /tmp /var/tmp +do + rm -rf ${_DIRECTORY} + + mkdir -p ${_DIRECTORY} + chmod 1777 ${_DIRECTORY} +done diff --git a/share/hooks/0195-remove-ssl-cert-snakeoil.chroot b/share/hooks/0195-remove-ssl-cert-snakeoil.chroot deleted file mode 100755 index cdfe39d24..000000000 --- a/share/hooks/0195-remove-ssl-cert-snakeoil.chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -# Remove ssl-cert snakeoil - -if [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] -then - rm -f /etc/ssl/certs/$(openssl x509 -hash -noout -in /etc/ssl/certs/ssl-cert-snakeoil.pem) - - rm -f /etc/ssl/certs/ssl-cert-snakeoil.pem - rm -f /etc/ssl/private/ssl-cert-snakeoil.key -fi diff --git a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot b/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot new file mode 100755 index 000000000..cdfe39d24 --- /dev/null +++ b/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Remove ssl-cert snakeoil + +if [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] +then + rm -f /etc/ssl/certs/$(openssl x509 -hash -noout -in /etc/ssl/certs/ssl-cert-snakeoil.pem) + + rm -f /etc/ssl/certs/ssl-cert-snakeoil.pem + rm -f /etc/ssl/private/ssl-cert-snakeoil.key +fi diff --git a/share/hooks/0200-remove-udev-persistent-cd-rules.chroot b/share/hooks/0200-remove-udev-persistent-cd-rules.chroot deleted file mode 100755 index bdfe52d96..000000000 --- a/share/hooks/0200-remove-udev-persistent-cd-rules.chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -# Remove udev persistent rules. -# -# This removes udev persistent rules that cache the host systems cd drive as -# well as the running live systems cd drive to remember its device name. - -if [ -e /etc/udev/rules.d ] -then - > /etc/udev/rules.d/70-persistent-cd.rules -fi diff --git a/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot b/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot new file mode 100755 index 000000000..bdfe52d96 --- /dev/null +++ b/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Remove udev persistent rules. +# +# This removes udev persistent rules that cache the host systems cd drive as +# well as the running live systems cd drive to remember its device name. + +if [ -e /etc/udev/rules.d ] +then + > /etc/udev/rules.d/70-persistent-cd.rules +fi diff --git a/share/hooks/0300-remove-udev-persistent-net-rules.chroot b/share/hooks/0300-remove-udev-persistent-net-rules.chroot deleted file mode 100755 index 148ba30d1..000000000 --- a/share/hooks/0300-remove-udev-persistent-net-rules.chroot +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -# Remove udev persistent rules. -# -# This removes udev persistent rules that cache the host systems mac address to -# remember its device name. - -for _FILE in /etc/udev/rules.d/*persistent-net.rules -do - if [ -e "${_FILE}" ] - then - : > ${_FILE} - fi -done diff --git a/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot b/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot new file mode 100755 index 000000000..148ba30d1 --- /dev/null +++ b/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +# Remove udev persistent rules. +# +# This removes udev persistent rules that cache the host systems mac address to +# remember its device name. + +for _FILE in /etc/udev/rules.d/*persistent-net.rules +do + if [ -e "${_FILE}" ] + then + : > ${_FILE} + fi +done diff --git a/share/hooks/0400-update-apt-file-cache.chroot b/share/hooks/0400-update-apt-file-cache.chroot deleted file mode 100755 index 60a00b39c..000000000 --- a/share/hooks/0400-update-apt-file-cache.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# Update the Apt File cache. -# -# This allows to use using apt-file out-of-the-box. - -. /root/config/binary - -if [ -x /usr/bin/apt-file ] && [ "${LB_APT_INDICES}" = "true" ] -then - apt-file update -fi diff --git a/share/hooks/0400-update-apt-file-cache.hook.chroot b/share/hooks/0400-update-apt-file-cache.hook.chroot new file mode 100755 index 000000000..60a00b39c --- /dev/null +++ b/share/hooks/0400-update-apt-file-cache.hook.chroot @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Update the Apt File cache. +# +# This allows to use using apt-file out-of-the-box. + +. /root/config/binary + +if [ -x /usr/bin/apt-file ] && [ "${LB_APT_INDICES}" = "true" ] +then + apt-file update +fi diff --git a/share/hooks/0410-update-apt-xapian-index.chroot b/share/hooks/0410-update-apt-xapian-index.chroot deleted file mode 100755 index dcb39b261..000000000 --- a/share/hooks/0410-update-apt-xapian-index.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# Update the Apt Xapian index. -# -# The package would do this itself, but (a) it checks policy-rc.d which says it -# is not allowed to, and (b) it wants to build the index in the background which -# will be racy in the context of live-build. - -if [ -x /usr/sbin/update-apt-xapian-index ] -then - PYTHONDONTWRITEBYTECODE=1 /usr/sbin/update-apt-xapian-index --force --quiet -fi diff --git a/share/hooks/0410-update-apt-xapian-index.hook.chroot b/share/hooks/0410-update-apt-xapian-index.hook.chroot new file mode 100755 index 000000000..dcb39b261 --- /dev/null +++ b/share/hooks/0410-update-apt-xapian-index.hook.chroot @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Update the Apt Xapian index. +# +# The package would do this itself, but (a) it checks policy-rc.d which says it +# is not allowed to, and (b) it wants to build the index in the background which +# will be racy in the context of live-build. + +if [ -x /usr/sbin/update-apt-xapian-index ] +then + PYTHONDONTWRITEBYTECODE=1 /usr/sbin/update-apt-xapian-index --force --quiet +fi diff --git a/share/hooks/0420-update-glx-alternative.chroot b/share/hooks/0420-update-glx-alternative.chroot deleted file mode 100755 index 8c36c43f9..000000000 --- a/share/hooks/0420-update-glx-alternative.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Use mesa renderer by default -if [ -e /etc/alternatives/glx ] -then - update-alternatives --quiet --set glx /usr/lib/mesa-diverted -fi diff --git a/share/hooks/0420-update-glx-alternative.hook.chroot b/share/hooks/0420-update-glx-alternative.hook.chroot new file mode 100755 index 000000000..8c36c43f9 --- /dev/null +++ b/share/hooks/0420-update-glx-alternative.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Use mesa renderer by default +if [ -e /etc/alternatives/glx ] +then + update-alternatives --quiet --set glx /usr/lib/mesa-diverted +fi diff --git a/share/hooks/0430-update-mlocate-database.chroot b/share/hooks/0430-update-mlocate-database.chroot deleted file mode 100755 index 6bfdb3d4f..000000000 --- a/share/hooks/0430-update-mlocate-database.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# Update the mlocate database. -# -# It is convenient for this to be already up to date on the live system, and it -# means that if the live system is later installed to a hard disk then less -# work will be required after installation. - -if [ -x /usr/bin/updatedb.mlocate ] -then - updatedb.mlocate -fi diff --git a/share/hooks/0430-update-mlocate-database.hook.chroot b/share/hooks/0430-update-mlocate-database.hook.chroot new file mode 100755 index 000000000..6bfdb3d4f --- /dev/null +++ b/share/hooks/0430-update-mlocate-database.hook.chroot @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Update the mlocate database. +# +# It is convenient for this to be already up to date on the live system, and it +# means that if the live system is later installed to a hard disk then less +# work will be required after installation. + +if [ -x /usr/bin/updatedb.mlocate ] +then + updatedb.mlocate +fi diff --git a/share/hooks/0440-update-nvidia-alternative.chroot b/share/hooks/0440-update-nvidia-alternative.chroot deleted file mode 100755 index e73b9678b..000000000 --- a/share/hooks/0440-update-nvidia-alternative.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -# Use newest nvidia version by default -if [ -e /etc/alternatives/nvidia ] && [ -e /usr/lib/nvidia/current ] -then - update-alternatives --quiet --set nvidia /usr/lib/nvidia/current -fi diff --git a/share/hooks/0440-update-nvidia-alternative.hook.chroot b/share/hooks/0440-update-nvidia-alternative.hook.chroot new file mode 100755 index 000000000..e73b9678b --- /dev/null +++ b/share/hooks/0440-update-nvidia-alternative.hook.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Use newest nvidia version by default +if [ -e /etc/alternatives/nvidia ] && [ -e /usr/lib/nvidia/current ] +then + update-alternatives --quiet --set nvidia /usr/lib/nvidia/current +fi diff --git a/share/hooks/0910-remove-apt-sources-lists b/share/hooks/0910-remove-apt-sources-lists new file mode 100755 index 000000000..1c8ca2d22 --- /dev/null +++ b/share/hooks/0910-remove-apt-sources-lists @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +# Remove apt sources.list files + +rm -f /etc/apt/sources.list +rm -f /etc/apt/sources.list.d/*.list diff --git a/share/hooks/0910-remove-apt-sources-lists.chroot b/share/hooks/0910-remove-apt-sources-lists.chroot deleted file mode 100755 index 1c8ca2d22..000000000 --- a/share/hooks/0910-remove-apt-sources-lists.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -# Remove apt sources.list files - -rm -f /etc/apt/sources.list -rm -f /etc/apt/sources.list.d/*.list -- cgit v1.2.3