Linstor support

README.md

@@ -158,10 +158,17 @@ used:
   - `yumdl.conf.tmpl` used to download files for the RPM repository
     included in the ISO
 
-* The "repo" layers (e.g. `updates`) each provide a yum repo
-  configuration file, and optionally an `INCLUDE` file to pull
-  additional base repo layers.  The `base` layer will always be in the
-  include chain.
+* The "repo" layers (e.g. `updates`) each provide:
+  - `yum-repos.conf.tmpl`, a yum repo configuration template
+  - optional `INCLUDE` file to pull additional base repo layers.  The
+    `base` layer contains a few extra files, and needs always be in
+    the include chain.
+
+Template files will be expanded by string substitution of
+`@@KEYWORD@@` patterns.  Some of them are for the scripts' internal
+use to fulfill tools requirements, a few of them are user-tunable,
+notably the `@@SRCURL@@` one, controlled by the `--srcurl` and
+`--srcurl:<overlay>` command-line flags.
 
 Other recognized config files:
 
@@ -205,6 +212,36 @@ sudo ./scripts/create-installimg.sh \
     8.3:testing install-8.3.testing.img
 ```
 
+### 8.3 updates and linstor
+
+The standalone linstor ISO requires extra packages from a separate
+repository.
+
+```
+./scripts/mirror-repos.sh 8.3 ~/mirrors/xcpng
+./scripts/mirror-repos.sh https://repo.vates.tech/xcp-ng/8/8.3 ~/mirrors/xcpng-rvt/8.3
+
+sudo ./scripts/create-installimg.sh \
+    --srcurl file://$HOME/mirrors/xcpng/8.3 \
+    --output install-8.3.img \
+    8.3:updates
+
+./scripts/create-iso.sh \
+    --srcurl file://$HOME/mirrors/xcpng/8.3 \
+    --srcurl:linstor file://$HOME/mirrors/xcpng-rvt/8.3 \
+    --output xcp-ng-8.3.linstor.iso \
+    --extra-packages "xcp-ng-linstor" \
+    -V "XCP-NG_830_TEST" \
+    8.3:updates:linstor install-8.3.img
+```
+
+> [!NOTE]
+>
+> This example only pulls the latest version of the LINSTOR packages.
+> To be suitable for update of a LINSTOR-enabled XCP-ng 8.2.1, it must
+> *also* be provided with the version matching the 8.2.1 installation.
+
+
 ### tip of 8.2 (8.2 + updates)
 
 ```

configs/8.2/yumdl.conf.tmpl

@@ -4,3 +4,4 @@ basearch=@@RPMARCH@@
 reposdir=@@YUMREPOSD@@
 cachedir=@@CACHEDIR@@
 persistdir=/dev/null
+skip_missing_names_on_install=0

configs/8.3/yumdl.conf.tmpl

@@ -4,3 +4,4 @@ basearch=@@RPMARCH@@
 reposdir=@@YUMREPOSD@@
 cachedir=@@CACHEDIR@@
 persistdir=/dev/null
+skip_missing_names_on_install=0

configs/linstor/yum-repos.conf.tmpl

@@ -0,0 +1,6 @@
+[xcpng-linstor]
+name=xcpng - linstor
+baseurl=@@SRCURL@@/linstor/@@RPMARCH@@/
+gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng
+failovermethod=priority
+skip_if_unavailable=False

scripts/create-installimg.sh

@@ -24,7 +24,6 @@ EOF
 VERBOSE=
 OUTPUT_IMG=
 FORCE_OVERWRITE=0
-SRCURL=
 declare -A CUSTOM_REPOS=()
 RPMARCH="x86_64"
 while [ $# -ge 1 ]; do

scripts/create-iso.sh

@@ -18,8 +18,12 @@ Options:
     -V <VOLID>                (mandatory) ISO volume ID
     --srcurl <URL>            get RPMs from base-config and overlays from <URL>
                               default: https://updates.xcp-ng.org/<MAJOR>/<DIST>
+    --srcurl:<OVERLAY> <URL>  get RPMs for specified <OVERLAY> from <URL>
+                              default: the global <URL> controled by --srcurl
     -D|--define-repo <NICK>!<URL>
                               add yum repo with name <NICK> and base URL <URL>
+    --extra-packages "<PACKAGE> [<PACKAGE> ...]"
+                              include packages and their dependencies in repo
     --efi-installer <mode>    select how to build the GRUB EFI binary. Valid modes:
                               rpm: take prebuilt xenserver/grubx64.efi from rpm
                               mkimage: call mkimage to generate an EFI binary
@@ -35,7 +39,7 @@ OUTISO=
 FORCE_OVERWRITE=0
 DOREPO=1
 SIGNSCRIPT=
-SRCURL=
+EXTRA_PACKAGES=
 declare -A CUSTOM_REPOS=()
 RPMARCH="x86_64"
 EFIMODE="rpm"
@@ -69,6 +73,13 @@ while [ $# -ge 1 ]; do
             SRCURL="$2"
             shift
             ;;
+        --srcurl:*)
+            [ $# -ge 2 ] || die_usage "$1 needs an argument"
+            OVL="${1#--srcurl:}"
+            [ -n "$OVL" -a -d "$topdir/configs/$OVL" ] || die_usage "$1 does not name an existing overlay"
+            SRCURLS["$OVL"]="$2"
+            shift
+            ;;
         -D|--define-repo)
             [ $# -ge 2 ] || die_usage "$1 needs an argument"
             case "$2" in
@@ -83,6 +94,11 @@ while [ $# -ge 1 ]; do
             CUSTOM_REPOS["$nick"]="$url"
             shift
             ;;
+        --extra-packages)
+            [ $# -ge 2 ] || die_usage "$1 needs an argument"
+            EXTRA_PACKAGES="$2"
+            shift
+            ;;
         --efi-installer)
             [ $# -ge 2 ] || die_usage "$1 needs an argument"
             case "$2" in
@@ -148,7 +164,7 @@ ISODIR=$(mktemp -d "$TMPDIR/installiso.XXXXXX")
 # temporary for storing downloaded files etc
 SCRATCHDIR=$(mktemp -d "$TMPDIR/tmp.XXXXXX")
 
-setup_yum_download "$DIST" "$RPMARCH" "$SRCURL"
+setup_yum_download "$DIST" "$RPMARCH"
 
 
 ## put all bits together
@@ -231,7 +247,7 @@ if [ $DOREPO = 1 ]; then
 
     mkdir ${VERBOSE} "$ISODIR/Packages"
 
-    get_rpms --depends "$ISODIR/Packages" xcp-ng-deps kernel-alt
+    get_rpms --depends "$ISODIR/Packages" xcp-ng-deps kernel-alt ${EXTRA_PACKAGES}
 
     createrepo_c ${VERBOSE} "$ISODIR"
     if [ -n "$SIGNSCRIPT" ]; then

scripts/lib/misc.sh

@@ -68,6 +68,9 @@ find_all_configs() {
 
 # default src URL depending on selected $DIST
 
+SRCURL=
+declare -A SRCURLS=()
+
 maybe_set_srcurl() {
     [ $# = 1 ] || die "maybe_set_srcurl: need exactly 1 argument"
     DIST="$1"
@@ -111,10 +114,9 @@ yumdl_is_dnf() {
 }
 
 setup_yum_download() {
-    [ $# = 3 ] || die "setup_yum_download: need exactly 3 arguments"
+    [ $# = 2 ] || die "setup_yum_download: need exactly 2 arguments"
     DIST="$1"
     RPMARCH="$2"
-    SRCURL="$3"
 
     YUMDLCONF_TMPL=$(find_config yumdl.conf.tmpl)
 
@@ -154,7 +156,7 @@ setup_yum_repos() {
         reponame=$(basename $(dirname "$YUMREPOSCONF_TMPL"))
         cat "$YUMREPOSCONF_TMPL" |
             sed \
-                -e "s,@@SRCURL@@,$SRCURL," \
+                -e "s,@@SRCURL@@,${SRCURLS[$reponame]:-$SRCURL}," \
                 -e "s,@@RPMARCH@@,$RPMARCH," \
                 > "$YUMREPOSD/$reponame.repo"
     done

scripts/mirror-repos.sh

@@ -26,5 +26,5 @@ command -v lftp >/dev/null || die "required tool not found: lftp"
 lftp -c mirror \
      --verbose \
      --delete \
-     --exclude="/Source/|-debuginfo-|-devel[-_]|/xs-opam-repo|/ocaml|/golang|/java" \
+     --exclude="/Source/|-debuginfo-|-debug-|-devel[-_]|/xs-opam-repo|/ocaml|/golang" \
      "$SRCURL" "$TARGET"