diff options
author | Enno Boland <g@s01.de> | 2014-12-05 02:17:57 +0100 |
---|---|---|
committer | Enno Boland <g@s01.de> | 2014-12-05 02:17:57 +0100 |
commit | 15c2b8e9b2d93b1363718e515e7f74c11a2cba60 (patch) | |
tree | c5bc3c9fc436c66c1d2bc8875df175a49f484bbf | |
parent | bfd7188589052c318ad002c465073fd80838c454 (diff) | |
download | hrmpf-15c2b8e9b2d93b1363718e515e7f74c11a2cba60.tar.gz hrmpf-15c2b8e9b2d93b1363718e515e7f74c11a2cba60.tar.xz hrmpf-15c2b8e9b2d93b1363718e515e7f74c11a2cba60.zip |
build-x86-images.sh.in: grub and dialog should be part of all live CDs.
-rw-r--r-- | build-x86-images.sh.in | 9 |
1 files changed, 7 insertions, 2 deletions
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" |