Tidy mkfs conf tools

Signed-off-by: Paul Mars <paul.mars@canonical.com>
canonical · Jun 18, 2024 · 2ce678a · 2ce678a
1 parent 33989d1
commit 2ce678a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tools/check-mkfs-confs.sh b/tools/check-mkfs-confs.sh
@@ -8,14 +8,15 @@ WORKDIR=$(pwd)
 DB="$WORKDIR"/mkfs/db
 NEW_DB="$WORKDIR"/mkfs/new_db
 MUST_UPDATE=0
+PKG=e2fsprogs
 
 if [ -f "$NEW_DB" ]; then
     rm "$NEW_DB" 
 fi
 
 IFS=$'\n'
 
-CANDIDATES=$(rmadison -S e2fsprogs | grep "e2fsprogs " | awk -F '|' '{print $3","$2}' | tr -d ' ')
+CANDIDATES=$(rmadison -S "${PKG}" | grep "${PKG} " | awk -F '|' '{print $3","$2}' | tr -d ' ')
 
 ubuntu-distro-info --supported -f > supported
 ubuntu-distro-info --supported-esm -f > supported_esm

diff --git a/tools/collect-mkfs-confs.sh b/tools/collect-mkfs-confs.sh
@@ -42,10 +42,10 @@ for FULL_SERIES in $TOTAL_SERIES; do
         SERIES_RELEASE_POCKET="$SERIES_RELEASE"
     fi
 
-    PKG_NAME=$(find . "${TMP_DIR}" -name "e2fsprogs_*.deb" | tail -1)
+    PKG_NAME=$(find . "${TMP_DIR}" -name "${PKG}_*.deb" | tail -1)
     VERSION=$(echo "$PKG_NAME" | cut -d "_" -f 2)
 
-    dpkg-deb --extract "$(find . "${TMP_DIR}" -name "e2fsprogs_*.deb" | tail -1)" "$TMP_DIR"/pkg/
+    dpkg-deb --extract "$(find . "${TMP_DIR}" -name "${PKG}_*.deb" | tail -1)" "$TMP_DIR"/pkg/
     mkdir -p "$MKFS_CONF"/"$SERIES_CODENAME"/
     ln -s -r "$MKFS_CONF"/"$SERIES_CODENAME"/ "$MKFS_CONF"/"$SERIES_RELEASE"
     cp "$TMP_DIR"/pkg/etc/mke2fs.conf "$MKFS_CONF"/"$SERIES_CODENAME"/