This commit is contained in:
parent
97e8e480af
commit
368d7dd27e
2 changed files with 16 additions and 5 deletions
|
@ -1,15 +1,26 @@
|
||||||
diff --git a/cleanup_image b/cleanup_image
|
diff --git a/cleanup_image b/cleanup_image
|
||||||
index 224c04a..7a03b9a 100755
|
index 224c04a..911b238 100755
|
||||||
--- a/cleanup_image
|
--- a/cleanup_image
|
||||||
+++ b/cleanup_image
|
+++ b/cleanup_image
|
||||||
@@ -20,5 +20,5 @@ fi
|
@@ -1,6 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
export INSTALLDIR=$1
|
||||||
|
+export TEMPLATE_USE_FUSE=1
|
||||||
|
|
||||||
|
. ./builder_setup
|
||||||
|
|
||||||
|
@@ -20,5 +21,8 @@ fi
|
||||||
echo "--> Cleaning up image file..."
|
echo "--> Cleaning up image file..."
|
||||||
$SCRIPTSDIR/09_cleanup.sh
|
$SCRIPTSDIR/09_cleanup.sh
|
||||||
|
|
||||||
-echo "--> Compacting image file..."
|
-echo "--> Compacting image file..."
|
||||||
-/sbin/fstrim -v "$INSTALLDIR"
|
-/sbin/fstrim -v "$INSTALLDIR"
|
||||||
+# echo "--> Compacting image file..."
|
+# fstrim not supported in userspace
|
||||||
+# /sbin/fstrim -v "$INSTALLDIR"
|
+if [ "$TEMPLATE_USE_FUSE" -ne 1 ]; then
|
||||||
|
+ echo "--> Compacting image file..."
|
||||||
|
+ /sbin/fstrim -v "$INSTALLDIR"
|
||||||
|
+fi
|
||||||
diff --git a/prepare_image b/prepare_image
|
diff --git a/prepare_image b/prepare_image
|
||||||
index 6334879..de1a2af 100755
|
index 6334879..de1a2af 100755
|
||||||
--- a/prepare_image
|
--- a/prepare_image
|
||||||
|
|
|
@ -10,7 +10,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Environment setup
|
- name: Environment setup
|
||||||
run: |
|
run: |
|
||||||
apk add rpm wget losetup coreutils eudev e2fsprogs xen doas sudo curl nodejs git alpine-sdk fuse2fs patch findutils
|
apk add rpm wget coreutils eudev e2fsprogs xen doas sudo curl nodejs git alpine-sdk fuse2fs patch findutils grep
|
||||||
cd /etc/apk/keys
|
cd /etc/apk/keys
|
||||||
curl -JO https://ayakael.net/api/packages/forge/alpine/key
|
curl -JO https://ayakael.net/api/packages/forge/alpine/key
|
||||||
- name: Repo pull
|
- name: Repo pull
|
||||||
|
|
Loading…
Reference in a new issue