eole-image-2.10.patch
| generate-iso | ||
|---|---|---|
| 192 | 192 |
esac |
| 193 | 193 | |
| 194 | 194 |
EOLE_RELEASE=$(echo ${RELEASE} | sed -nE 's,([[:digit:]].[[:digit:]].[[:digit:]]).*,\1,p')
|
| 195 |
EOLE_VERSION=$(echo ${RELEASE} | sed -nE 's,([[:digit:]].[[:digit:]]).*,\1,p')
|
|
| 195 |
# FIXME 2.XX |
|
| 196 |
#EOLE_VERSION=$(echo ${RELEASE} | sed -nE 's,([[:digit:]].[[:digit:]]).*,\1,p')
|
|
| 197 |
EOLE_VERSION=2.10 |
|
| 196 | 198 |
ENVOLE_VERSION=9 |
| 197 | 199 |
echo "EOLE_RELEASE=$EOLE_RELEASE" |
| 198 | 200 |
echo "EOLE_VERSION=$EOLE_VERSION" |
| lib/libeole-image.sh | ||
|---|---|---|
| 39 | 39 |
UBUNTU_RELEASE="22.04" |
| 40 | 40 |
UBUNTU_DISTRIB="jammy" |
| 41 | 41 |
;; |
| 42 |
2.10*) |
|
| 43 |
UBUNTU_RELEASE="24.04" |
|
| 44 |
UBUNTU_DISTRIB="noble" |
|
| 45 |
;; |
|
| 42 | 46 |
*) |
| 43 | 47 |
die "Unsupported EOLE release '${RELEASE}'"
|
| 44 | 48 |
;; |
| 45 | 49 |
esac |
| 46 |
UBUNTU_ISO=$(curl -sSL "${UBUNTU_RELEASE_URL}/${UBUNTU_DISTRIB}" | grep -oP "ubuntu-${UBUNTU_RELEASE/./\\.}\.\d*-live-server-amd64\.iso" | head -n 1)
|
|
| 47 |
UBUNTU_ISO_URL="${UBUNTU_RELEASE_URL}/${UBUNTU_DISTRIB}/${UBUNTU_ISO}"
|
|
| 50 |
set -x |
|
| 51 |
#UBUNTU_ISO=$(curl -sSL "${UBUNTU_RELEASE_URL}/${DISTRIB}" | grep -oP "ubuntu-${UBUNTU_RELEASE/./\\.}\.\d*-live-server-amd64\.iso" | head -n 1)
|
|
| 52 |
# FIXME 24.04 |
|
| 53 |
UBUNTU_ISO="ubuntu-24.04-live-server-amd64.iso" |
|
| 54 |
UBUNTU_ISO_URL="${UBUNTU_RELEASE_URL}/${UBUNTU_RELEASE}/${UBUNTU_ISO}"
|
|
| 48 | 55 |
UBUNTU_RELEASE=$(echo "${UBUNTU_ISO}" | cut -f2 -d-)
|
| 49 | ||
| 50 | 56 |
if check_ubuntu_iso |
| 51 | 57 |
then |
| 52 | 58 |
info "☑️ Use existing ISO '${UBUNTU_ISO}'"
|
| ... | ... | |
| 130 | 136 |
#echo "FICHIER_USER_DATA=${FICHIER_USER_DATA}"
|
| 131 | 137 |
#echo "EOLE_VERSION=${EOLE_VERSION}" # 2.9
|
| 132 | 138 |
#echo "EOLE_RELEASE=${EOLE_RELEASE}" # 2.9.0
|
| 133 |
|
|
| 139 | ||
| 134 | 140 |
# Tout le texte yaml avant le dépot EOLE |
| 135 | 141 |
sed -e "/http:\/\/eole.ac-dijon.fr\/eole eole-${EOLE_VERSION}-unstable/,\$d" "${FICHIER_AUTOINSTALL_YAML}" >"${FICHIER_USER_DATA}"
|
| 136 |
|
|
| 142 | ||
| 137 | 143 |
# Gestion EOLE |
| 138 | 144 |
if LIGNE_EOLE_UNSTABLE=$(grep "http:\/\/eole.ac-dijon.fr\/eole eole-${EOLE_VERSION}-unstable" "${FICHIER_AUTOINSTALL_YAML}" )
|
| 139 | 145 |
then |
| ... | ... | |
| 155 | 161 |
echo "${LIGNE_EOLE_UNSTABLE}" >>"${FICHIER_USER_DATA}"
|
| 156 | 162 |
fi |
| 157 | 163 |
else |
| 158 |
die "👿 eole-${EOLE_VERSION}-unstable n'est pas dans le fichier ${FICHIER_AUTOINSTALL_YAML}"
|
|
| 164 |
die "👿 eole-${EOLE_VERSION}-unstable n'est pas dans le fichier ${FICHIER_AUTOINSTALL_YAML}"
|
|
| 159 | 165 |
fi |
| 160 |
|
|
| 166 | ||
| 161 | 167 |
# Gestion ENVOLE |
| 162 | 168 |
if LIGNE_ENVOLE_UNSTABLE=$(grep "http:\/\/eole.ac-dijon.fr\/envole envole-${ENVOLE_VERSION}-unstable" "${FICHIER_AUTOINSTALL_YAML}" );
|
| 163 | 169 |
then |
| ... | ... | |
| 179 | 185 |
# Tout le texte yaml apres le dépot EOLE, dans le cas ou il n y a pas de ligne Envole |
| 180 | 186 |
sed -e "1,/http:\/\/eole.ac-dijon.fr\/eole eole-${EOLE_VERSION}-unstable/d" "${FICHIER_AUTOINSTALL_YAML}" >>"${FICHIER_USER_DATA}"
|
| 181 | 187 |
fi |
| 182 |
|
|
| 188 | ||
| 183 | 189 |
# affichage pour vérification |
| 184 | 190 |
grep "deb " "${FICHIER_USER_DATA}" || /bin/true
|
| 185 | 191 |
return 0 |
| ... | ... | |
| 192 | 198 |
cp -r "${SELF_DIR}/nocloud" "${ISO_SRC}"
|
| 193 | 199 |
while read -r FICHIER |
| 194 | 200 |
do |
| 195 |
update_autoinstall_sources "$FICHIER"
|
|
| 201 |
update_autoinstall_sources "$FICHIER" |
|
| 196 | 202 |
done < <(find "${ISO_SRC}/nocloud/" -name 'autoinstall.yaml')
|
| 197 | 203 |
#update_autoinstall_sources iso-src/nocloud/scribe/autoinstall.yaml |
| 198 |
info "👍 Updated user-data and meta-data files"
|
|
| 204 |
info "👍 Updated user-data and meta-data files" |
|
| 199 | 205 |
} |
| 200 | 206 | |
| 201 | 207 |
copy_scripts() {
|
| ... | ... | |
| 221 | 227 |
patch_subiquity() {
|
| 222 | 228 |
local FS_FILE="${ISO_SRC}/casper/ubuntu-server-minimal.ubuntu-server.installer.squashfs"
|
| 223 | 229 |
local FS_DIR="${ISO_SRC}/casper/squashfs-ubuntu-server-minimal.ubuntu-server.installer.squashfs"
|
| 224 |
local SNAP_FILE="${FS_DIR}/var/lib/snapd/snaps/subiquity_5004.snap"
|
|
| 230 |
local SNAP_FILE="${FS_DIR}/var/lib/snapd/snaps/subiquity_5741.snap"
|
|
| 225 | 231 |
local SNAP_DIR="${ISO_SRC}/casper/squashfs-subiquity.snap"
|
| 226 | 232 | |
| 227 | 233 |
# Uncompress squashfs |
| nocloud/amon/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/amonecole/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
deb http://eole.ac-dijon.fr/envole envole-9-unstable main |
| 27 | 27 |
key: | |
| 28 | 28 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| nocloud/eolebase/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/hapy-node/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/hapy/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/horus/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/scribe/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
deb http://eole.ac-dijon.fr/envole envole-9-unstable main |
| 27 | 27 |
key: | |
| 28 | 28 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| nocloud/seshat/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/seth/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/sphynx/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/thot/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |
| nocloud/zephir/autoinstall.yaml | ||
|---|---|---|
| 22 | 22 |
sources: |
| 23 | 23 |
additional.list: |
| 24 | 24 |
source: | |
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.9-unstable main cloud
|
|
| 25 |
deb http://eole.ac-dijon.fr/eole eole-2.10-unstable main cloud
|
|
| 26 | 26 |
key: | |
| 27 | 27 |
-----BEGIN PGP PUBLIC KEY BLOCK----- |
| 28 | 28 |
Version: GnuPG v1.4.12 (GNU/Linux) |