summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-09-05 13:12:34 +0200
committerChristian Grothoff <christian@grothoff.org>2021-09-05 13:12:34 +0200
commit35973a53de083d1774e03826e627aa78c776a93d (patch)
treed9270dd62d90dbef064a5ad608cd84f25c45bc3d
parent8b88a8dec3c6cbd8e7bbba6a90be09408585f3ef (diff)
downloadgrid5k-35973a53de083d1774e03826e627aa78c776a93d.tar.gz
grid5k-35973a53de083d1774e03826e627aa78c776a93d.tar.bz2
grid5k-35973a53de083d1774e03826e627aa78c776a93d.zip
image updates
-rw-r--r--README15
-rw-r--r--debian11-taler.yaml (renamed from debian10-taler.yaml)4
-rw-r--r--gridboot.service4
-rw-r--r--update.sh2
4 files changed, 21 insertions, 4 deletions
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/debian11-taler.yaml
index 86f804d..fd84692 100644
--- a/debian10-taler.yaml
+++ b/debian11-taler.yaml
@@ -24,7 +24,9 @@ global:
## Version
g5k_version: 2
## Environment image path and compression
- g5k_tgz_path: /home/grothoff/my_g5k_images/debian10-taler.tgz
+ # 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
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