i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3rdparty/cloud: Update instructions for gcp

Browse Source 
* Unfortunately, functionality of Haiku r1beta5 under
  gcp is blocked by #18962 (virtio_scsi not getting irqs
  with our now guarded heap)

Change-Id: Ibf70419762e9a222bcb86b7418282cc409e17986
This commit is contained in:
Alexander von Gluck
2024-09-24 16:07:58 -05:00
parent d0ff5bacff
commit 9a6a20d468
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/cloud/sysprep-gce.sh
Vendored
+20 -11
View File
@@ -21,16 +21,20 @@
# * Needed on r1b4 due to / permissions fix needed by sshd # * Needed on r1b4 due to / permissions fix needed by sshd
# * Shutdown VM. DO NOT BOOT FROM NEW DISK! # * Shutdown VM. DO NOT BOOT FROM NEW DISK!
# * Booting from new disk will cause SSH host keys to generate! (#18186) # * Booting from new disk will cause SSH host keys to generate! (#18186)
# * Compress tar cvzf haiku-r1beta4-v20221222.tar.gz disk.raw # * Compress tar cvzf haiku-r1beta5-x64-v20241024.tar.gz disk.raw
# * Upload to google cloud storage bucket for haiku.inc (ex: haiku-images/r1beta4/xxx) # * Upload to google cloud storage bucket for the haiku-inc project (ex: haiku-images/r1beta4/xxx)
# ex: gcloud storage cp ./haiku-master-x64-v20231024.tar.gz gs://haiku-images/master/haiku-master-x64-v20231024.tar.gz # ex: gcloud storage cp ./haiku-r1beta5-x64-v20241024.tar.gz gs://haiku-images/master/haiku-r1beta5-x64-v20241024.tar.gz
# * Import image (be sure to update version information below) # * Import image (be sure to update version information below)
# * compute engine -> images # ex: gcloud compute images create haiku-r1beta5-x64-v20241024 \
# * create image # --project=haiku-inc \
# * source: Cloud storage file -> haiku-images/r1beta4/xxx # --description=Haiku\ R1/Beta5\ x86_64 \
# * name: haiku-r1beta4-x64-v20221222 # --family=haiku-r1beta5-x64 \
# * family: haiku-r1beta4-x64 # --source-uri=https://storage.googleapis.com/haiku-images/r1beta5/haiku-r1beta5-x64-v20240924.tar.gz \
# * description: Haiku R1/Beta4 x86_64 # --labels=os=haiku,release=r1beta5 \
# --storage-location=us \
# --architecture=X86_64
# * Add allAuthenticatedUsers principal to "Compute Image User" role on the new image
# permissions to make it public
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
echo "usage: $0 <HAIKU ROOTFS>" echo "usage: $0 <HAIKU ROOTFS>"
@@ -47,8 +51,8 @@ echo ""
echo "Installing basic authentication stuff..." echo "Installing basic authentication stuff..."
# Installs gce_metadata_ssh tool for sshd. This lets you control the keys # Installs gce_metadata_ssh tool for sshd. This lets you control the keys
# of the "user" user from GKE. ONLY "user" WORKS! We have no PAM for gce's os-login stuff # of the "user" user from GKE. ONLY "user" WORKS! We have no PAM for gce's os-login stuff
wget https://eu.hpkg.haiku-os.org/haikuports/r1beta4/x86_64/current/packages/smolcloudtools-$SMOL_RELEASE-x86_64.hpkg \ wget https://eu.hpkg.haiku-os.org/haikuports/current/$(uname -m)/current/packages/smolcloudtools-$SMOL_RELEASE-$(uname -m).hpkg \
-O $TARGET_ROOTFS/system/packages/smolcloudtools-$SMOL_RELEASE-x86_64.hpkg -O $TARGET_ROOTFS/system/packages/smolcloudtools-$SMOL_RELEASE-$(uname -m).hpkg
echo "Configuring ssh..." echo "Configuring ssh..."
# Configure SSHD (reminder, sshd sees "user" as root since it is UID 0) # Configure SSHD (reminder, sshd sees "user" as root since it is UID 0)
@@ -58,6 +62,11 @@ echo "AuthorizedKeysCommandUser user" >> $TARGET_ROOTFS/system/settings/ssh/sshd
echo "PasswordAuthentication no" >> $TARGET_ROOTFS/system/settings/ssh/sshd_config echo "PasswordAuthentication no" >> $TARGET_ROOTFS/system/settings/ssh/sshd_config
echo "PermitRootLogin without-password" >> $TARGET_ROOTFS/system/settings/ssh/sshd_config echo "PermitRootLogin without-password" >> $TARGET_ROOTFS/system/settings/ssh/sshd_config
echo "Configuring kernel..."
# GCP likes serial debug data on com0 (helps in troubleshooting)
sed -i "s/^serial_debug_output .*$/serial_debug_output true/g" $TARGET_ROOTFS/home/config/settings/kernel/drivers/kernel
sed -i "s/^serial_debug_port .*$/serial_debug_port 0/g" $TARGET_ROOTFS/home/config/settings/kernel/drivers/kernel
unmount $TARGET_ROOTFS unmount $TARGET_ROOTFS
echo "Complete! Please shutdown VM. DO NOT BOOT FROM NEW OS IMAGE!" echo "Complete! Please shutdown VM. DO NOT BOOT FROM NEW OS IMAGE!"