From fcb0440df12b68abda3f59c80ec456c8d77e0dae Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 8 May 2009 08:49:58 +0200 Subject: [PATCH] 'more small fixes' --- lib/initcpio/install/arch_base | 4 ++-- lib/initcpio/install/arch_base_lowmem | 2 +- lib/initcpio/install/arch_lvm2 | 2 +- lib/initcpio/install/arch_net | 2 +- lib/initcpio/install/arch_pacman | 2 +- lib/initcpio/install/arch_usbutils | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/initcpio/install/arch_base b/lib/initcpio/install/arch_base index 77182b3c8..d83bfdc23 100644 --- a/lib/initcpio/install/arch_base +++ b/lib/initcpio/install/arch_base @@ -34,7 +34,7 @@ install () ### adding needed programs from running system add_file "${CONFIG}" "/config" SCRIPT="arch_base" - BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink" + BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim-normal lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink" add_file "/bin/echo" add_file "/bin/gunzip" add_file "/bin/zcat" @@ -80,7 +80,7 @@ install () add_file "/usr/share/licenses/hdparm/LICENSE.TXT" add_file "/usr/share/licenses/ncurses/license.txt" add_file "/usr/share/licenses/pcre/LICENSE" - add_file "/usr/share/licenses/shadow/LICENSE" + add_file "/usr/share/licenses/shadow/COPYING" add_file "/usr/share/licenses/sdparm/COPYING" add_file "/usr/share/licenses/vim/license.txt" add_file "/usr/share/licenses/zlib/license.txt" diff --git a/lib/initcpio/install/arch_base_lowmem b/lib/initcpio/install/arch_base_lowmem index 67f00d7cb..bea2688b0 100644 --- a/lib/initcpio/install/arch_base_lowmem +++ b/lib/initcpio/install/arch_base_lowmem @@ -65,7 +65,7 @@ install () add_file "/usr/share/licenses/hdparm/LICENSE.TXT" add_file "/usr/share/licenses/ncurses/license.txt" add_file "/usr/share/licenses/pcre/LICENSE" - add_file "/usr/share/licenses/shadow/LICENSE + add_file "/usr/share/licenses/shadow/COPYING" add_file "/usr/share/licenses/sdparm/COPYING" add_file "/usr/share/licenses/zlib/license.txt" } diff --git a/lib/initcpio/install/arch_lvm2 b/lib/initcpio/install/arch_lvm2 index 38d1d6ccc..eacff008e 100644 --- a/lib/initcpio/install/arch_lvm2 +++ b/lib/initcpio/install/arch_lvm2 @@ -2,7 +2,7 @@ install () { - MODULES="checked_modules "drivers/md/dm-*"" + MODULES=" $(checked_modules "drivers/md/dm-*") " BINARIES="lvm fsadm lvmdump" FILES="" SCRIPT="arch_lvm2" diff --git a/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index f0a3c2543..c7f7782e2 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -43,7 +43,7 @@ install () add_file "/usr/share/licenses/dhclient/LICENSE" add_file "/usr/share/licenses/dnsutils/LICENSE" add_file "/usr/share/licenses/heimdal/LICENSE" - add_file "/usr/share/licenses/openssh/LICENSE" + add_file "/usr/share/licenses/openssh/LICENCE" add_file "/usr/share/licenses/openssl/LICENSE" add_file "/usr/share/licenses/sqlite3/license.txt" add_file "/usr/share/licenses/tcp_wrappers/license.txt" diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman index f4ad34d03..25594ba74 100644 --- a/lib/initcpio/install/arch_pacman +++ b/lib/initcpio/install/arch_pacman @@ -16,7 +16,7 @@ dosfstools udev initscripts filesystem kernel26 kernel26-firmware glibc kernel-h dhcpcd bzip2 gcc-libs openssl zlib libelf gpm sysfsutils libgcrypt libgpg-error popt kexec-tools ppp libpcap \ rp-pppoe lilo grub iptables capi4k-utils ntfs-3g isdn4k-utils pciutils usbutils vpnc openvpn b43-fwcutter \ wpa_supplicant gzip rsync libarchive libdownload device-mapper cracklib nfs-utils nfsidmap readline acl attr \ -pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm pptpclient licenses \ +pcre cpio archboot fuse klibc libusb vim lzo2 libsasl libldap libevent gpm sdparm pptpclient licenses \ rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \ zd1211-firmware ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \ smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp \ diff --git a/lib/initcpio/install/arch_usbutils b/lib/initcpio/install/arch_usbutils index 0315b5092..5e7d575ba 100644 --- a/lib/initcpio/install/arch_usbutils +++ b/lib/initcpio/install/arch_usbutils @@ -7,7 +7,6 @@ install () FILES="" SCRIPT="" add_file "/usr/share/hwdata/usb.ids" - add_file "/usr/sbin/update-usbids" } help ()