adopt changes to quickinst script

This commit is contained in:
Tobias Powalowski 2010-08-11 17:14:06 +02:00
parent ea3c5de019
commit a95ebbb9e8

View file

@ -127,24 +127,24 @@ install_packages() {
PACKAGES="$(pacman -Sg base | awk '{print $2}')"
fi
# Add packages which are not in core repository
if [ "$(grep -w nvidia-kms /proc/cmdline)" -a "$VMLINUZ" = "kernel26-lts" ]; then
! [ "$(grep -w nouveau-drm $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-drm-lts"
! [ "$(grep -w nouveau-firmware $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-firmware"
if [ "$(grep -q -w nvidia-kms /proc/cmdline)" -a "$VMLINUZ" = "kernel26-lts" ]; then
! [ "$(grep -q -w nouveau-drm $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-drm-lts"
! [ "$(grep -q -w nouveau-firmware $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-firmware"
fi
if [ "$(grep -w uvesafb /proc/cmdline)" ]; then
! [ "$(grep -w v86d $PACKAGES)" ] && PACKAGES="$PACKAGES v86d"
if [ "$(grep -q -w uvesafb /proc/cmdline)" ]; then
! [ "$(grep -q -w v86d $PACKAGES)" ] && PACKAGES="$PACKAGES v86d"
fi
if [ "$(blkid -c /dev/null -o value -s TYPE | grep ntfs)" ]; then
! [ "$(grep -w ntfs-3g $PACKAGES)" ] && PACKAGES="$PACKAGES ntfs-3g"
if [ "$(blkid -c /dev/null -o value -s TYPE | grep -q ntfs)" ]; then
! [ "$(grep -q -w ntfs-3g $PACKAGES)" ] && PACKAGES="$PACKAGES ntfs-3g"
fi
if [ "$(blkid -c /dev/null -o value -s TYPE | grep btrfs)" ]; then
if [ "$(blkid -c /dev/null -o value -s TYPE | grep -q btrfs)" ]; then
! [ "$(grep -w btrfs-progs-unstable $PACKAGES)" ] && PACKAGES="$PACKAGES btrfs-progs-unstable"
fi
if [ "$(blkid -c /dev/null -o value -s TYPE | grep nilfs2)" ]; then
! [ "$(grep -w nilfs-utils $PACKAGES)" ] && PACKAGES="$PACKAGES nilfs-utils"
if [ "$(blkid -c /dev/null -o value -s TYPE | grep -q nilfs2)" ]; then
! [ "$(grep -q -w nilfs-utils $PACKAGES)" ] && PACKAGES="$PACKAGES nilfs-utils"
fi
if [ -e /var/state/dhcp/dhclient.leases ]; then
! [ "$(grep -w dhclient $PACKAGES)" ] && PACKAGES="$PACKAGES dhclient"
! [ "$(grep -q -w dhclient $PACKAGES)" ] && PACKAGES="$PACKAGES dhclient"
fi
# Only install the booted kernel image!