From 15c2b8e9b2d93b1363718e515e7f74c11a2cba60 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 Dec 2014 02:17:57 +0100 Subject: build-x86-images.sh.in: grub and dialog should be part of all live CDs. --- build-x86-images.sh.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'build-x86-images.sh.in') diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index e0a5fe4..65d7dc8 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -7,8 +7,13 @@ readonly E_IMG=void-live-${ARCH}-${DATE}-enlightenment.iso readonly XFCE_IMG=void-live-${ARCH}-${DATE}-xfce.iso readonly MATE_IMG=void-live-${ARCH}-${DATE}-mate.iso -readonly BASE_PKGS="dialog" -readonly X_PKGS="xorg-minimal xorg-input-drivers xorg-video-drivers lxdm setxkbmap xauth" +case "$ARCH" in + i686) GRUB="grub";; + x86_64) GRUB="grub-x86_64-efi";; +esac + +readonly BASE_PKGS="dialog $GRUB" +readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers lxdm setxkbmap xauth" readonly E_PKGS="$X_PKGS cantarell-fonts enlightenment terminology econnman udisks2 firefox" readonly XFCE_PKGS="$X_PKGS xfce4 cantarell-fonts firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" readonly MATE_PKGS="$X_PKGS mate mate-extra cantarell-fonts firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" -- cgit 1.4.1