From 0c4affde370c7d4119c5585a3e053ae2cf52ee35 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 13 Feb 2010 14:11:54 +0100 Subject: [PATCH] fixed depmod call in fb hook --- etc/archboot/allinone-lts.conf | 2 +- etc/archboot/allinone.conf | 2 +- etc/archboot/default-ftp-pxelinux.conf | 2 +- etc/archboot/default-ftp.conf | 2 +- etc/archboot/default-pxelinux.conf | 2 +- etc/archboot/default.conf | 2 +- lib/initcpio/hooks/arch_fb | 2 +- lib/initcpio/install/arch_fb | 2 -- lib/initcpio/install/arch_updates | 17 ----------------- 9 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 lib/initcpio/install/arch_updates diff --git a/etc/archboot/allinone-lts.conf b/etc/archboot/allinone-lts.conf index 3289f19f1..7eee7d5aa 100644 --- a/etc/archboot/allinone-lts.conf +++ b/etc/archboot/allinone-lts.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_udev_lts arch_fb_lts arch_intel_wireless arch_hwdetect_lts arch_udevtrigger arch_ide_lts pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw_lts arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman_lts arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav arch_updates net" +HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_udev_lts arch_fb_lts arch_intel_wireless arch_hwdetect_lts arch_udevtrigger arch_ide_lts pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw_lts arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman_lts arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index c4185bc18..68863a638 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav arch_updates net" +HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index bc42430db..15f77d8cd 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_updates net" +HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index b6e6d46f4..0dfe041db 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav arch_updates net" +HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index 3b0aefbdb..d4e668af0 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_wipe arch_testdisk arch_ddrescue arch_clamav arch_updates net" +HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_wipe arch_testdisk arch_ddrescue arch_clamav net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index 94744f4d3..f062d900c 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe arch_testdisk arch_ddrescue arch_clamav arch_updates net" +HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_udev arch_fb arch_intel_wireless arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe arch_testdisk arch_ddrescue arch_clamav net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/lib/initcpio/hooks/arch_fb b/lib/initcpio/hooks/arch_fb index b8d33c1af..9121d324e 100644 --- a/lib/initcpio/hooks/arch_fb +++ b/lib/initcpio/hooks/arch_fb @@ -19,7 +19,6 @@ run_hook () else echo "blacklist nouveau" >> /etc/modprobe.d/framebuffer_blacklist.conf rm /lib/modules/$(uname -r)/updates/* - depmod -a fi if [ "$ati_kms" = "y" ]; then msg ":: Switching to ati kms mode..." @@ -37,6 +36,7 @@ run_hook () fi # load correct module if ! [ "$fbmodule" = "" -a "$fbmodule" = "y" ]; then + depmod -a msg ":: Loading ${fbmodule}..." modprobe -aq $fbmodule >/dev/null 2>&1 fi diff --git a/lib/initcpio/install/arch_fb b/lib/initcpio/install/arch_fb index a6b8e15cc..b1abd51b5 100644 --- a/lib/initcpio/install/arch_fb +++ b/lib/initcpio/install/arch_fb @@ -7,8 +7,6 @@ install () FILES="" SCRIPT="arch_fb" add_file "/usr/share/archboot/fb/etc/modprobe.d/uvesafb.conf" "/etc/modprobe.d/uvesafb.conf" - # insert latest nouveau helper modules - add_full_dir "/lib/modules/$KERNELVERSION/kernel/updates" } help () diff --git a/lib/initcpio/install/arch_updates b/lib/initcpio/install/arch_updates deleted file mode 100644 index 875ece932..000000000 --- a/lib/initcpio/install/arch_updates +++ /dev/null @@ -1,17 +0,0 @@ -# Created by Tobias Powalowski - -install () -{ - MODULES="" - BINARIES="" - FILES="" - SCRIPT="" - [ -d "/lib/modules/$KERNELVERSION/kernel/updates" ] && add_full_dir "/lib/modules/$KERNELVERSION/kernel/updates" -} - -help () -{ -cat<