summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/container@10
-rw-r--r--cfg-version/qos@20
-rw-r--r--debian/control1
-rwxr-xr-xscripts/install/install-postinst-new7
5 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 58e15388..81fb6bc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,6 +72,7 @@ curver_DATA += cfg-version/isis@1
curver_DATA += cfg-version/bgp@3
curver_DATA += cfg-version/ospf@1
curver_DATA += cfg-version/policy@5
+curver_DATA += cfg-version/qos@2
curver_DATA += cfg-version/conntrack@3
curver_DATA += cfg-version/conntrack-sync@2
curver_DATA += cfg-version/ipsec@10
@@ -80,6 +81,7 @@ curver_DATA += cfg-version/https@3
curver_DATA += cfg-version/flow-accounting@1
curver_DATA += cfg-version/firewall@7
curver_DATA += cfg-version/ids@1
+curver_DATA += cfg-version/container@1
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
diff --git a/cfg-version/container@1 b/cfg-version/container@1
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/cfg-version/container@1
diff --git a/cfg-version/qos@2 b/cfg-version/qos@2
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/cfg-version/qos@2
diff --git a/debian/control b/debian/control
index 6c2f78d3..e94e4084 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: adduser,
efibootmgr,
libefivar0 | libefivar1,
grub-efi-amd64-bin [amd64],
+ grub-efi-arm64-bin [arm64],
dosfstools,
gdisk,
vyatta-biosdevname
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
index 19257398..8bb7c8bd 100755
--- a/scripts/install/install-postinst-new
+++ b/scripts/install/install-postinst-new
@@ -24,6 +24,11 @@ INSTALL_TYPE=$3
# Default user
DEFAULT_USER=vyos
+GRUB_ARCH=x86_64-efi
+if [ $(uname -m) = "aarch64" ]; then
+ GRUB_ARCH=arm64-efi
+fi
+
# copy configuration to the config directory
copy_config () {
local cfg_dir=${INST_ROOT}${VYATTA_CFG_DIR}
@@ -138,7 +143,7 @@ install_grub () {
fi
mkdosfs -F 32 -s 1 -n EFI /dev/$part >&/dev/null
mount /dev/$part $grub_root/boot/efi
- output=$(grub-install --no-floppy --recheck --target=x86_64-efi --force-extra-removable --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" --no-uefi-secure-boot 2>&1)
+ output=$(grub-install --no-floppy --recheck --target="${GRUB_ARCH}" --force-extra-removable --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" --no-uefi-secure-boot 2>&1)
umount $grub_root/boot/efi
##TODO DO we need these to be in fstab??
#