Эх сурвалжийг харах

build-x86-images.sh.in: grub and dialog should be part of all live CDs.

Enno Boland 10 жил өмнө
parent
commit
15c2b8e9b2

+ 7 - 2
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"