sync with parabolaiso changes

Signed-off-by: David P <megver83@parabola.nu>

8 files changed, 10 insertions, 8 deletions

diff --git a/lxde-openrc/airootfs/etc/mkinitcpio.conf b/lxde-openrc/airootfs/etc/mkinitcpio.conf
index d637173..d3a5186 100644
--- a/lxde-openrc/airootfs/etc/mkinitcpio.conf
+++ b/lxde-openrc/airootfs/etc/mkinitcpio.conf
@@ -49,7 +49,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard)
+HOOKS=(base udev modconf memdisk parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/lxde-openrc/airootfs/root/.automated_script.sh b/lxde-openrc/airootfs/root/.automated_script.sh
index 5c0c316..52c47e6 100755
--- a/lxde-openrc/airootfs/root/.automated_script.sh
+++ b/lxde-openrc/airootfs/root/.automated_script.sh
@@ -16,7 +16,7 @@ automated_script ()
     script="$(script_cmdline)"
     if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
         if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
-            curl "${script}" --location --retry-connrefused -s -o /tmp/startup_script >/dev/null
+            curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null
             rt=$?
         else
             cp "${script}" /tmp/startup_script
diff --git a/lxde-openrc/packages.both b/lxde-openrc/packages.both
index 3c9c908..e02fd38 100644
--- a/lxde-openrc/packages.both
+++ b/lxde-openrc/packages.both
@@ -18,6 +18,7 @@ dmraid
 dnsmasq
 dosfstools
 e2fsprogs
+edk2-shell
 efibootmgr
 espeakup-openrc
 elogind
@@ -31,6 +32,7 @@ gpart
 gpm-openrc
 gptfdisk
 grml-zsh-config
+grub
 hdparm-openrc
 irssi
 iw
@@ -79,6 +81,7 @@ ppp
 pptpclient
 pv
 qemu-guest-agent
+refind
 reflector
 reiserfsprogs
 rp-pppoe
diff --git a/lxde-openrc/packages.x86_64 b/lxde-openrc/packages.x86_64
deleted file mode 100644
index 31579bc..0000000
--- a/lxde-openrc/packages.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-edk2-shell
-refind
diff --git a/releng-openrc/airootfs/etc/mkinitcpio.conf b/releng-openrc/airootfs/etc/mkinitcpio.conf
index d637173..d3a5186 100644
--- a/releng-openrc/airootfs/etc/mkinitcpio.conf
+++ b/releng-openrc/airootfs/etc/mkinitcpio.conf
@@ -49,7 +49,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard)
+HOOKS=(base udev modconf memdisk parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/releng-openrc/airootfs/root/.automated_script.sh b/releng-openrc/airootfs/root/.automated_script.sh
index 5c0c316..52c47e6 100755
--- a/releng-openrc/airootfs/root/.automated_script.sh
+++ b/releng-openrc/airootfs/root/.automated_script.sh
@@ -16,7 +16,7 @@ automated_script ()
     script="$(script_cmdline)"
     if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
         if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
-            curl "${script}" --location --retry-connrefused -s -o /tmp/startup_script >/dev/null
+            curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null
             rt=$?
         else
             cp "${script}" /tmp/startup_script
diff --git a/releng-openrc/packages.both b/releng-openrc/packages.both
index bdc2180..e9e2f9a 100644
--- a/releng-openrc/packages.both
+++ b/releng-openrc/packages.both
@@ -17,6 +17,7 @@ dmraid
 dnsmasq
 dosfstools
 e2fsprogs
+edk2-shell
 efibootmgr
 espeakup-openrc
 elogind
@@ -30,6 +31,7 @@ gpart
 gpm-openrc
 gptfdisk
 grml-zsh-config
+grub
 hdparm-openrc
 irssi
 iw
@@ -78,6 +80,7 @@ ppp
 pptpclient
 pv
 qemu-guest-agent
+refind
 reflector
 reiserfsprogs
 rp-pppoe
diff --git a/releng-openrc/packages.x86_64 b/releng-openrc/packages.x86_64
deleted file mode 100644
index 31579bc..0000000
--- a/releng-openrc/packages.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-edk2-shell
-refind