summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuilder/modules.d/openslx_tmp_format/module-setup.sh4
-rwxr-xr-xbuilder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh (renamed from builder/modules.d/openslx_tmp_format/scripts/format_openslx_tmp.sh)0
-rwxr-xr-xbuilder/modules.d/openslx_tmp_mount/module-setup.sh2
-rwxr-xr-xbuilder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh (renamed from builder/modules.d/openslx_tmp_mount/scripts/mount_newroot_tmp.sh)0
4 files changed, 2 insertions, 4 deletions
diff --git a/builder/modules.d/openslx_tmp_format/module-setup.sh b/builder/modules.d/openslx_tmp_format/module-setup.sh
index c20eb1dd..551d2d8e 100755
--- a/builder/modules.d/openslx_tmp_format/module-setup.sh
+++ b/builder/modules.d/openslx_tmp_format/module-setup.sh
@@ -9,8 +9,6 @@ depends() {
echo dnbd3-rootfs
}
install() {
- # must be *after* the download of the openslx config
- # which is currently 00-fetch-config.sh
- inst_hook pre-mount 10 "$moddir/scripts/format_openslx_tmp.sh"
+ inst_hook pre-pivot 20 "$moddir/scripts/openslx_tmp_format.sh"
inst_multiple mkfs.xfs mkfs.ext4
}
diff --git a/builder/modules.d/openslx_tmp_format/scripts/format_openslx_tmp.sh b/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh
index 26b6cb81..26b6cb81 100755
--- a/builder/modules.d/openslx_tmp_format/scripts/format_openslx_tmp.sh
+++ b/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh
diff --git a/builder/modules.d/openslx_tmp_mount/module-setup.sh b/builder/modules.d/openslx_tmp_mount/module-setup.sh
index 77c8f40b..cb110467 100755
--- a/builder/modules.d/openslx_tmp_mount/module-setup.sh
+++ b/builder/modules.d/openslx_tmp_mount/module-setup.sh
@@ -9,5 +9,5 @@ depends() {
echo dnbd3-rootfs
}
install() {
- inst_hook pre-mount 50 "$moddir/scripts/format_newroot_tmp.sh"
+ inst_hook pre-pivot 30 "$moddir/scripts/openslx_tmp_mount.sh"
}
diff --git a/builder/modules.d/openslx_tmp_mount/scripts/mount_newroot_tmp.sh b/builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh
index 48e733c7..48e733c7 100755
--- a/builder/modules.d/openslx_tmp_mount/scripts/mount_newroot_tmp.sh
+++ b/builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh