Adding debian version 4.0~a1-1.debian/4.0_a1-1

52 files changed, 19 insertions, 217 deletions

diff --git a/share/bin/Packages b/share/bin/Packages
index 83c7e9352..a839e9a14 100755
--- a/share/bin/Packages
+++ b/share/bin/Packages
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/share/bootloaders/extlinux/advanced.cfg b/share/bootloaders/extlinux/advanced.cfg
deleted file mode 100644
index c0b2f0e26..000000000
--- a/share/bootloaders/extlinux/advanced.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-	com32 hdt.c32
diff --git a/share/bootloaders/extlinux/hdt.c32 b/share/bootloaders/extlinux/hdt.c32
deleted file mode 120000
index e50929575..000000000
--- a/share/bootloaders/extlinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/install.cfg b/share/bootloaders/extlinux/install.cfg
index 9177dd739..94fb81660 100644
--- a/share/bootloaders/extlinux/install.cfg
+++ b/share/bootloaders/extlinux/install.cfg
@@ -1,11 +1 @@
-label install
-	menu label ^Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ -- quiet
-
-label installgui
-	menu label ^Graphical install
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+# FIXME
diff --git a/share/bootloaders/extlinux/ldlinux.c32 b/share/bootloaders/extlinux/ldlinux.c32
deleted file mode 120000
index c937af6a5..000000000
--- a/share/bootloaders/extlinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/libcom32.c32 b/share/bootloaders/extlinux/libcom32.c32
deleted file mode 120000
index bca5e3c27..000000000
--- a/share/bootloaders/extlinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/libutil.c32 b/share/bootloaders/extlinux/libutil.c32
deleted file mode 120000
index 351e12b3c..000000000
--- a/share/bootloaders/extlinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/extlinux/menu.cfg b/share/bootloaders/extlinux/menu.cfg
index d2daa8005..6e2ae94c4 100644
--- a/share/bootloaders/extlinux/menu.cfg
+++ b/share/bootloaders/extlinux/menu.cfg
@@ -5,13 +5,6 @@ menu title Boot menu
 include stdmenu.cfg
 include live.cfg
 include install.cfg
-menu begin advanced
-	menu title Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
 menu end
 
 menu clear
diff --git a/share/bootloaders/extlinux/stdmenu.cfg b/share/bootloaders/extlinux/stdmenu.cfg
index 671b16f78..d4036bfa1 100644
--- a/share/bootloaders/extlinux/stdmenu.cfg
+++ b/share/bootloaders/extlinux/stdmenu.cfg
@@ -5,7 +5,7 @@ menu color sel		* #ffffffff #76a1d0ff *
 menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg	* #ffffffff #00000000 *
 menu color help		37;40 #ffdddd00 #00000000 none
-menu vshift 12
+menu vshift 17
 menu rows 10
 menu helpmsgrow 15
 # The command line must be at least one line from the bottom.
diff --git a/share/bootloaders/isolinux/advanced.cfg b/share/bootloaders/isolinux/advanced.cfg
deleted file mode 100644
index c0b2f0e26..000000000
--- a/share/bootloaders/isolinux/advanced.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-	com32 hdt.c32
diff --git a/share/bootloaders/isolinux/hdt.c32 b/share/bootloaders/isolinux/hdt.c32
deleted file mode 120000
index e50929575..000000000
--- a/share/bootloaders/isolinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/install.cfg b/share/bootloaders/isolinux/install.cfg
index 9177dd739..94fb81660 100644
--- a/share/bootloaders/isolinux/install.cfg
+++ b/share/bootloaders/isolinux/install.cfg
@@ -1,11 +1 @@
-label install
-	menu label ^Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ -- quiet
-
-label installgui
-	menu label ^Graphical install
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+# FIXME
diff --git a/share/bootloaders/isolinux/ldlinux.c32 b/share/bootloaders/isolinux/ldlinux.c32
deleted file mode 120000
index c937af6a5..000000000
--- a/share/bootloaders/isolinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/libcom32.c32 b/share/bootloaders/isolinux/libcom32.c32
deleted file mode 120000
index bca5e3c27..000000000
--- a/share/bootloaders/isolinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/libutil.c32 b/share/bootloaders/isolinux/libutil.c32
deleted file mode 120000
index 351e12b3c..000000000
--- a/share/bootloaders/isolinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/menu.cfg b/share/bootloaders/isolinux/menu.cfg
index d2daa8005..6e2ae94c4 100644
--- a/share/bootloaders/isolinux/menu.cfg
+++ b/share/bootloaders/isolinux/menu.cfg
@@ -5,13 +5,6 @@ menu title Boot menu
 include stdmenu.cfg
 include live.cfg
 include install.cfg
-menu begin advanced
-	menu title Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
 menu end
 
 menu clear
diff --git a/share/bootloaders/isolinux/stdmenu.cfg b/share/bootloaders/isolinux/stdmenu.cfg
index 671b16f78..d4036bfa1 100644
--- a/share/bootloaders/isolinux/stdmenu.cfg
+++ b/share/bootloaders/isolinux/stdmenu.cfg
@@ -5,7 +5,7 @@ menu color sel		* #ffffffff #76a1d0ff *
 menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg	* #ffffffff #00000000 *
 menu color help		37;40 #ffdddd00 #00000000 none
-menu vshift 12
+menu vshift 17
 menu rows 10
 menu helpmsgrow 15
 # The command line must be at least one line from the bottom.
diff --git a/share/bootloaders/pxelinux/advanced.cfg b/share/bootloaders/pxelinux/advanced.cfg
deleted file mode 100644
index c0b2f0e26..000000000
--- a/share/bootloaders/pxelinux/advanced.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-	com32 hdt.c32
diff --git a/share/bootloaders/pxelinux/hdt.c32 b/share/bootloaders/pxelinux/hdt.c32
deleted file mode 120000
index e50929575..000000000
--- a/share/bootloaders/pxelinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/install.cfg b/share/bootloaders/pxelinux/install.cfg
index 9177dd739..94fb81660 100644
--- a/share/bootloaders/pxelinux/install.cfg
+++ b/share/bootloaders/pxelinux/install.cfg
@@ -1,11 +1 @@
-label install
-	menu label ^Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ -- quiet
-
-label installgui
-	menu label ^Graphical install
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+# FIXME
diff --git a/share/bootloaders/pxelinux/ldlinux.c32 b/share/bootloaders/pxelinux/ldlinux.c32
deleted file mode 120000
index c937af6a5..000000000
--- a/share/bootloaders/pxelinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/libcom32.c32 b/share/bootloaders/pxelinux/libcom32.c32
deleted file mode 120000
index bca5e3c27..000000000
--- a/share/bootloaders/pxelinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/libutil.c32 b/share/bootloaders/pxelinux/libutil.c32
deleted file mode 120000
index 351e12b3c..000000000
--- a/share/bootloaders/pxelinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/menu.cfg b/share/bootloaders/pxelinux/menu.cfg
index d2daa8005..6e2ae94c4 100644
--- a/share/bootloaders/pxelinux/menu.cfg
+++ b/share/bootloaders/pxelinux/menu.cfg
@@ -5,13 +5,6 @@ menu title Boot menu
 include stdmenu.cfg
 include live.cfg
 include install.cfg
-menu begin advanced
-	menu title Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
 menu end
 
 menu clear
diff --git a/share/bootloaders/pxelinux/stdmenu.cfg b/share/bootloaders/pxelinux/stdmenu.cfg
index 671b16f78..d4036bfa1 100644
--- a/share/bootloaders/pxelinux/stdmenu.cfg
+++ b/share/bootloaders/pxelinux/stdmenu.cfg
@@ -5,7 +5,7 @@ menu color sel		* #ffffffff #76a1d0ff *
 menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg	* #ffffffff #00000000 *
 menu color help		37;40 #ffdddd00 #00000000 none
-menu vshift 12
+menu vshift 17
 menu rows 10
 menu helpmsgrow 15
 # The command line must be at least one line from the bottom.
diff --git a/share/bootloaders/syslinux/advanced.cfg b/share/bootloaders/syslinux/advanced.cfg
deleted file mode 100644
index c0b2f0e26..000000000
--- a/share/bootloaders/syslinux/advanced.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-	com32 hdt.c32
diff --git a/share/bootloaders/syslinux/hdt.c32 b/share/bootloaders/syslinux/hdt.c32
deleted file mode 120000
index e50929575..000000000
--- a/share/bootloaders/syslinux/hdt.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/hdt.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/install.cfg b/share/bootloaders/syslinux/install.cfg
index 9177dd739..94fb81660 100644
--- a/share/bootloaders/syslinux/install.cfg
+++ b/share/bootloaders/syslinux/install.cfg
@@ -1,11 +1 @@
-label install
-	menu label ^Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ -- quiet
-
-label installgui
-	menu label ^Graphical install
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+# FIXME
diff --git a/share/bootloaders/syslinux/ldlinux.c32 b/share/bootloaders/syslinux/ldlinux.c32
deleted file mode 120000
index c937af6a5..000000000
--- a/share/bootloaders/syslinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/libcom32.c32 b/share/bootloaders/syslinux/libcom32.c32
deleted file mode 120000
index bca5e3c27..000000000
--- a/share/bootloaders/syslinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/libutil.c32 b/share/bootloaders/syslinux/libutil.c32
deleted file mode 120000
index 351e12b3c..000000000
--- a/share/bootloaders/syslinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/libutil.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/menu.cfg b/share/bootloaders/syslinux/menu.cfg
index 93682602d..6e2ae94c4 100644
--- a/share/bootloaders/syslinux/menu.cfg
+++ b/share/bootloaders/syslinux/menu.cfg
@@ -5,13 +5,6 @@ menu title Boot menu
 include stdmenu.cfg
 include live.cfg
 include install.cfg
-menu begin advanced
-	menu title ^Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
 menu end
 
 menu clear
diff --git a/share/bootloaders/syslinux/stdmenu.cfg b/share/bootloaders/syslinux/stdmenu.cfg
index 671b16f78..d4036bfa1 100644
--- a/share/bootloaders/syslinux/stdmenu.cfg
+++ b/share/bootloaders/syslinux/stdmenu.cfg
@@ -5,7 +5,7 @@ menu color sel		* #ffffffff #76a1d0ff *
 menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg	* #ffffffff #00000000 *
 menu color help		37;40 #ffdddd00 #00000000 none
-menu vshift 12
+menu vshift 17
 menu rows 10
 menu helpmsgrow 15
 # The command line must be at least one line from the bottom.
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/0300-update-apt-file-cache.chroot b/share/hooks/0010-update-apt-file-cache.chroot
index 60a00b39c..60a00b39c 100755
--- a/share/hooks/0300-update-apt-file-cache.chroot
+++ b/share/hooks/0010-update-apt-file-cache.chroot
diff --git a/share/hooks/0310-update-apt-xapian-index.chroot b/share/hooks/0020-update-apt-xapian-index.chroot
index dcb39b261..dcb39b261 100755
--- a/share/hooks/0310-update-apt-xapian-index.chroot
+++ b/share/hooks/0020-update-apt-xapian-index.chroot
diff --git a/share/hooks/0330-update-mlocate-database.chroot b/share/hooks/0030-update-mlocate-database.chroot
index 6bfdb3d4f..6bfdb3d4f 100755
--- a/share/hooks/0330-update-mlocate-database.chroot
+++ b/share/hooks/0030-update-mlocate-database.chroot
diff --git a/share/hooks/0120-remove-dbus-machine-id.chroot b/share/hooks/0040-remove-dbus-machine-id.chroot
index 230099e46..230099e46 100755
--- a/share/hooks/0120-remove-dbus-machine-id.chroot
+++ b/share/hooks/0040-remove-dbus-machine-id.chroot
diff --git a/share/hooks/0130-remove-gnome-icon-cache.chroot b/share/hooks/0050-remove-gnome-icon-cache.chroot
index ab35a1d68..f562fd939 100755
--- a/share/hooks/0130-remove-gnome-icon-cache.chroot
+++ b/share/hooks/0050-remove-gnome-icon-cache.chroot
@@ -4,6 +4,6 @@ set -e
 
 # Remove GNOME icon cache.
 #
-# This saves space some space.
+# This saves space some space (e.g. on Kubuntu).
 
 rm -f /usr/share/icons/*/icon-theme.cache
diff --git a/share/hooks/0160-remove-openssh-server-host-keys.chroot b/share/hooks/0060-remove-openssh-server-host-keys.chroot
index 862704981..862704981 100755
--- a/share/hooks/0160-remove-openssh-server-host-keys.chroot
+++ b/share/hooks/0060-remove-openssh-server-host-keys.chroot
diff --git a/share/hooks/0170-remove-python-py.chroot b/share/hooks/0070-remove-python-py.chroot
index ff705838f..ff705838f 100755
--- a/share/hooks/0170-remove-python-py.chroot
+++ b/share/hooks/0070-remove-python-py.chroot
diff --git a/share/hooks/0200-remove-udev-persistent-rules.chroot b/share/hooks/0080-remove-udev-persistent-rules.chroot
index 148ba30d1..148ba30d1 100755
--- a/share/hooks/0200-remove-udev-persistent-rules.chroot
+++ b/share/hooks/0080-remove-udev-persistent-rules.chroot
diff --git a/share/hooks/0910-remove-apt-sources-lists.chroot b/share/hooks/0090-remove-apt-sources-lists.chroot
index 1c8ca2d22..074b551a1 100755
--- a/share/hooks/0910-remove-apt-sources-lists.chroot
+++ b/share/hooks/0090-remove-apt-sources-lists.chroot
@@ -5,4 +5,5 @@ set -e
 # Remove apt sources.list files
 
 rm -f /etc/apt/sources.list
+rm -f /etc/apt/sources.list~
 rm -f /etc/apt/sources.list.d/*.list
diff --git a/share/hooks/0100-remove-adjtime-configuration.chroot b/share/hooks/0100-remove-adjtime-configuration.chroot
deleted file mode 100755
index 5625effb8..000000000
--- a/share/hooks/0100-remove-adjtime-configuration.chroot
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Reset generated file
-
-if [ -e /run ]
-then
-	# wheezy
-
-cat > /etc/adjtime << EOF
-0.0 0 0.0
-0
-UTC
-EOF
-
-else
-	# squeeze
-	echo "0.0 0 0.0" > /etc/adjtime
-fi
diff --git a/share/hooks/0100-remove-linux-image-backups.chroot b/share/hooks/0100-remove-linux-image-backups.chroot
new file mode 100755
index 000000000..1302d6c93
--- /dev/null
+++ b/share/hooks/0100-remove-linux-image-backups.chroot
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# Remove backup files
+
+rm -f /boot/*.bak
+rm -f /boot/*.old-dkms
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/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/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/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/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/0320-update-glx-alternative.chroot b/share/hooks/0320-update-glx-alternative.chroot
deleted file mode 100755
index 8c36c43f9..000000000
--- a/share/hooks/0320-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/0340-update-nvidia-alternative.chroot b/share/hooks/0340-update-nvidia-alternative.chroot
deleted file mode 100755
index e73b9678b..000000000
--- a/share/hooks/0340-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