From d87e99aa481452a59df1a9653b32689fa181f5c5 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Tue, 22 Dec 2009 22:06:33 +0100
Subject: [PATCH] addded nouveau-firmware

---
 lib/initcpio/install/arch_pacman   | 2 +-
 usr/share/archboot/installer/setup | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman
index b43aac0f1..29f6b5f0b 100644
--- a/lib/initcpio/install/arch_pacman
+++ b/lib/initcpio/install/arch_pacman
@@ -23,7 +23,7 @@ smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware
 v86d wlan-ng26-utils iw crda wireless-regdb libnl iproute2 dhclient syslinux mtools perl \
 gmp heimdal sqlite3 db dbus-core libcap fsarchiver iwlwifi-5150-ucode xz-utils librpcsecgss libtirpc \
 wipe ddrescue testdisk clamav iwlwifi-1000-ucode iwlwifi-6000-ucode ar9170-fw rt2870usb-fw ifplugd \
-libdaemon nouveau-drm wpa_actiond"
+libdaemon nouveau-drm nouveau-firmware wpa_actiond"
 
 for i in $DEPENDS; do
 	for k in  $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 95f89718d..c2cfaf028 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ANSWER="/tmp/.setup"
 TITLE="Arch Linux Installation"
@@ -10,7 +10,7 @@ EDITOR=
 
 # name of the kernel image
 VMLINUZ="vmlinuz26"
-[ $(cat /proc/cmdline | grep -w arch.*-lts) ] && VMLINUZ="vmlinuz26-lts"
+[ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ] && VMLINUZ="vmlinuz26-lts"
 
 # abstract the common pacman args
 PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar"
@@ -2135,8 +2135,8 @@ installpkg() {
     [ "$(blkid -c /dev/null -o value -s TYPE | grep ntfs)" ] && ! [ "$(grep -w ntfs-3g $PACKAGES)" ] && PACKAGES="$PACKAGES ntfs-3g"
     [ -e /var/state/dhcp/dhclient.leases ] && ! [ "$(grep -w dhclient $PACKAGES)" ] && PACKAGES="$PACKAGES dhclient"
     # Only install the booted kernel image!
-    PACKAGES=$(echo $PACKAGES | sed -i -e "s#\ kernel26\ ##g" -e  "s#\ kernel26-lts\ ##g")
-    PACKAGES="$PACKAGES $VMLINUZ"
+    PACKAGES="$(echo $PACKAGES | sed -e "s#\ kernel26\ # #g" -e  "s#\ kernel26-lts\ # #g")"
+    PACKAGES="$PACKAGES $(echo $VMLINUZ | sed -e 's#vmlinuz#kernel#g')"
     # create chroot environment on target system
     # code straight from mkarchroot
     chroot_mount