From 35973a53de083d1774e03826e627aa78c776a93d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 5 Sep 2021 13:12:34 +0200 Subject: image updates --- README | 15 ++++++++++- debian10-taler.yaml | 75 --------------------------------------------------- debian11-taler.yaml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gridboot.service | 4 +-- update.sh | 2 ++ 5 files changed, 95 insertions(+), 78 deletions(-) delete mode 100644 debian10-taler.yaml create mode 100644 debian11-taler.yaml diff --git a/README b/README index fb8478a..d679abb 100644 --- a/README +++ b/README @@ -1,5 +1,18 @@ Use -$ kameleon build debian10-taler.yaml --enable-cache +$ kameleon build debian11-taler.yaml --enable-cache to build the image. + +Note: theg5k_tgz_file option is not propagated to the ".dsc" file, +so we must adjust it manually (in build/debian11-taler/debian11-taler.dsc) +and set 'file' to: + + file: http://public.lyon.grid5000.fr/~grothoff/debian11-taler.tar.zst + + +Afterwards: + +$ cd build/debian11-taler +$ scp debian11-taler.dsc debian11-taler.tar.zst \ + grothoff@access.grid5000.fr:lyon/public/ diff --git a/debian10-taler.yaml b/debian10-taler.yaml deleted file mode 100644 index 86f804d..0000000 --- a/debian10-taler.yaml +++ /dev/null @@ -1,75 +0,0 @@ -#============================================================================== -# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80 -#============================================================================== -# -# DESCRIPTION: Customization of a Debian 10 image with GNU Taler repositories. -# -#============================================================================== -# This recipe extends another. To look at the step involed, run: -# kameleon dryrun debian10_custom.yaml -# To see the variables that you can override, use the following command: -# kameleon info debian10_custom.yaml ---- -extend: grid5000/debian11-x64-min.yaml - -global: - ### Uncomment and adapt the global variables below as needed - - ## Export format to generate - # appliance_formats: qcow2 tar.zst - - ## Environment description customization - ## Author - g5k_author: "grothoff@gnu.org" - ## Version - g5k_version: 2 - ## Environment image path and compression - g5k_tgz_path: /home/grothoff/my_g5k_images/debian10-taler.tgz - # g5k_tar_compression: "zstd" - ## Environment postinstall path, compression, and script command - # g5k_postinst_path: server:///grid5000/postinstalls/g5k-postinstall.tgz - # g5k_postinst_compression: "gzip" - # g5k_postinst_script: g5k-postinstall --net debian - ## Environment kernel path and params - # g5k_kernel_path: "/vmlinuz" - # g5k_initrd_path: "/initrd.img" - # g5k_kernel_params: "" - ## Environment visibility - # g5k_visibility: "shared" - other_packages_no_clean: nginx postgresql-13 taler-exchange taler-auditor taler-merchant taler-exchange-offline taler-wallet-cli sudo git zile - - ## Other parameters can be changed, see kameleon info debian10-taler.yaml - -bootstrap: - ### The bootstrap section takes in charge the initial installation of the - ## system (distribution installation). No modification should be needed here. - - "@base" - -setup: - ### The setup section is where customizations of the system take place. - ## We can request steps from the extended recipe to be executed - - "@base" - - taler_install - ## We add steps required by our customization after or before @base. Use - ## kameleon dryrun debian10_custom.yaml to see the resulting steps in the build. - ## The following is given as example only, replace with your steps. - - a_customization_step: - - microstep1: - - exec_in: | - cd /root - git clone git://git.taler.net/grid5k.git - cp grid5k/gridboot.service /etc/systemd/system/gridboot.service - chmod 640 /etc/systemd/system/gridboot.service - cp grid5k/at-boot.sh /usr/local/bin/at-boot.sh - chmod +x /usr/local/bin/at-boot.sh - systemctl daemon-reload - systemctl enable gridboot - - - microstep1: - # This breakpoint will stop the build for inspecting the environment - - breakpoint - -export: - ### The export section takes in charge the export of your customized Grid'5000 - ## environment. No modification should be needed here. - - "@base" diff --git a/debian11-taler.yaml b/debian11-taler.yaml new file mode 100644 index 0000000..fd84692 --- /dev/null +++ b/debian11-taler.yaml @@ -0,0 +1,77 @@ +#============================================================================== +# vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80 +#============================================================================== +# +# DESCRIPTION: Customization of a Debian 10 image with GNU Taler repositories. +# +#============================================================================== +# This recipe extends another. To look at the step involed, run: +# kameleon dryrun debian10_custom.yaml +# To see the variables that you can override, use the following command: +# kameleon info debian10_custom.yaml +--- +extend: grid5000/debian11-x64-min.yaml + +global: + ### Uncomment and adapt the global variables below as needed + + ## Export format to generate + # appliance_formats: qcow2 tar.zst + + ## Environment description customization + ## Author + g5k_author: "grothoff@gnu.org" + ## Version + g5k_version: 2 + ## Environment image path and compression + # Note: unknown why this is not propagated to the ".dsc" file, + # So we must adjust it manually! + g5k_tgz_file: http://public.lyon.grid5000.fr/~grothoff/debian10-taler.tar.zst + # g5k_tar_compression: "zstd" + ## Environment postinstall path, compression, and script command + # g5k_postinst_path: server:///grid5000/postinstalls/g5k-postinstall.tgz + # g5k_postinst_compression: "gzip" + # g5k_postinst_script: g5k-postinstall --net debian + ## Environment kernel path and params + # g5k_kernel_path: "/vmlinuz" + # g5k_initrd_path: "/initrd.img" + # g5k_kernel_params: "" + ## Environment visibility + # g5k_visibility: "shared" + other_packages_no_clean: nginx postgresql-13 taler-exchange taler-auditor taler-merchant taler-exchange-offline taler-wallet-cli sudo git zile + + ## Other parameters can be changed, see kameleon info debian10-taler.yaml + +bootstrap: + ### The bootstrap section takes in charge the initial installation of the + ## system (distribution installation). No modification should be needed here. + - "@base" + +setup: + ### The setup section is where customizations of the system take place. + ## We can request steps from the extended recipe to be executed + - "@base" + - taler_install + ## We add steps required by our customization after or before @base. Use + ## kameleon dryrun debian10_custom.yaml to see the resulting steps in the build. + ## The following is given as example only, replace with your steps. + - a_customization_step: + - microstep1: + - exec_in: | + cd /root + git clone git://git.taler.net/grid5k.git + cp grid5k/gridboot.service /etc/systemd/system/gridboot.service + chmod 640 /etc/systemd/system/gridboot.service + cp grid5k/at-boot.sh /usr/local/bin/at-boot.sh + chmod +x /usr/local/bin/at-boot.sh + systemctl daemon-reload + systemctl enable gridboot + + - microstep1: + # This breakpoint will stop the build for inspecting the environment + - breakpoint + +export: + ### The export section takes in charge the export of your customized Grid'5000 + ## environment. No modification should be needed here. + - "@base" diff --git a/gridboot.service b/gridboot.service index 59fd8ee..509a682 100644 --- a/gridboot.service +++ b/gridboot.service @@ -1,8 +1,8 @@ [Unit] Description=Modify image based on grid5k Git on boot -Wants=network.target -After=syslog.target network-online.target +Wants=network-online.target +After=syslog.target network.target network-online.target [Service] Type=oneshot diff --git a/update.sh b/update.sh index bce9ea6..2e8b0df 100644 --- a/update.sh +++ b/update.sh @@ -3,6 +3,8 @@ # latest version from Git). set -eu +touch /root/at-boot-worked + # Override default /etc/ with the one from this Git. cp -r /root/grid5k/etc/* /etc -- cgit v1.2.3