diff options
| author | ramon <ramongomez@us.es> | 2018-04-30 08:03:51 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2018-04-30 08:03:51 +0000 |
| commit | 98dedfcce3462eda232e7a6e6a9461f3d4c124a7 (patch) | |
| tree | 2d36d3b66e55329aec699f34e983fb50eef951a1 | |
| parent | 2e980556cdaf26128fb699101a57462186ea2114 (diff) | |
#802: Usar Shim como cargador primario para evitar fallos con algunas BIOS UEFI.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5762 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | installer/opengnsys_installer.sh | 6 | ||||
| -rw-r--r-- | server/etc/dhcpd.conf.tmpl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 7d3cca46..76563275 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -167,7 +167,7 @@ OSVERSION="${OSVERSION%%.*}" # Configuración según la distribución GNU/Linux (usar minúsculas). case "$OSDISTRIB" in ubuntu|debian|linuxmint) - DEPENDENCIES=( subversion apache2 php php-ldap libapache2-mod-php mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq wakeonlan udpcast grub-efi-amd64-signed ) + DEPENDENCIES=( subversion apache2 php php-ldap libapache2-mod-php mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq wakeonlan udpcast shim-signed grub-efi-amd64-signed ) UPDATEPKGLIST="apt-get update" INSTALLPKG="apt-get -y install --force-yes" CHECKPKG="dpkg -s \$package 2>/dev/null | grep Status | grep -qw install" @@ -1261,6 +1261,7 @@ function copyServerFiles () # Lista de ficheros y directorios origen y de directorios destino. local SOURCES=( server/tftpboot \ + /usr/lib/shim/shimx64.efi.signed \ /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed \ server/bin \ repoman/bin \ @@ -1274,6 +1275,7 @@ function copyServerFiles () doc ) local TARGETS=( tftpboot \ tftpboot \ + tftpboot/grubx64.efi \ bin \ bin \ lib \ @@ -1302,7 +1304,7 @@ function copyServerFiles () elif [ -d "${SOURCES[$i]}" ]; then echoAndLog "Copying content of ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}" cp -a "${SOURCES[$i]}"/* "${path_opengnsys_base}/${TARGETS[$i]}" - else + else warningAndLog "Unable to copy ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}" fi done diff --git a/server/etc/dhcpd.conf.tmpl b/server/etc/dhcpd.conf.tmpl index afe8d58c..04a8b73f 100644 --- a/server/etc/dhcpd.conf.tmpl +++ b/server/etc/dhcpd.conf.tmpl @@ -14,7 +14,7 @@ subnet NETIP netmask NETMASK { filename "grldr"; # 0007 == x64 EFI boot if option arch = 00:07 { - filename "grubnetx64.efi.signed"; + filename "shimx64.efi.signed"; } else { filename "grldr"; } |