From 382feea68d619572ab4650c0dd5bd8aff69904b4 Mon Sep 17 00:00:00 2001 From: henglikuang1 Date: Thu, 11 Jan 2024 11:44:25 +0800 Subject: [PATCH 1/2] Add default time zone as UTC --- confluent_server/confluent/selfservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/selfservice.py b/confluent_server/confluent/selfservice.py index cd4180c7..3d7feebb 100644 --- a/confluent_server/confluent/selfservice.py +++ b/confluent_server/confluent/selfservice.py @@ -30,7 +30,7 @@ import eventlet webclient = eventlet.import_patched('pyghmi.util.webclient') -currtz = None +currtz = 'UTC' keymap = 'us' currlocale = 'en_US.UTF-8' currtzvintage = None From ea88ccb0add2b661dcd7daa5fe6393f0e5cdeb40 Mon Sep 17 00:00:00 2001 From: henglikuang1 Date: Thu, 11 Jan 2024 14:31:45 +0800 Subject: [PATCH 2/2] Fix efivars handling of unexpected unmount --- confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh | 1 + confluent_osdeploy/ubuntu22.04/profiles/default/scripts/post.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh index 7b970285..16a624c3 100755 --- a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh +++ b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh @@ -56,6 +56,7 @@ cp /custom-installation/confluent/bin/apiclient /target/opt/confluent/bin mount -o bind /dev /target/dev mount -o bind /proc /target/proc mount -o bind /sys /target/sys +mount -o bind /sys/firmware/efi/efivars /target/sys/firmware/efi/efivars if [ 1 = $updategrub ]; then chroot /target update-grub fi diff --git a/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/post.sh b/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/post.sh index 773bf8ad..d9730889 100755 --- a/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/post.sh +++ b/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/post.sh @@ -60,6 +60,7 @@ cp /custom-installation/confluent/bin/apiclient /target/opt/confluent/bin mount -o bind /dev /target/dev mount -o bind /proc /target/proc mount -o bind /sys /target/sys +mount -o bind /sys/firmware/efi/efivars /target/sys/firmware/efi/efivars if [ 1 = $updategrub ]; then chroot /target update-grub fi