Skip to content

Commit 874cd63

Browse files
committed
run_qemu.sh: move reinstall_ndctl.sh outside ndctl/
We use rsync --delete to install ndctl/ which forced us to install our script AFTER. This is inconvenient, so separate things better. This prepares the next commit. Signed-off-by: Marc Herbert <[email protected]>
1 parent f5d7552 commit 874cd63

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

mkosi/extra/root/ndctl/reinstall.sh mkosi/extra/root/reinstall_ndctl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MYDIR=$(dirname "$0")
77

88
main()
99
{
10-
cd "$MYDIR"
10+
cd "$MYDIR"/ndctl
1111
rm -rf build
1212
meson setup build
1313
meson configure -Dtest=enabled -Ddestructive=enabled build

run_qemu.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1008,20 +1008,20 @@ check_ndctl_dir()
10081008

10091009
prepare_ndctl_build()
10101010
{
1011-
cp "${script_dir}"/mkosi/extra/root/ndctl/reinstall.sh \
1012-
mkosi.extra/root/ndctl/
1011+
cp "${script_dir}"/mkosi/extra/root/reinstall_ndctl.sh \
1012+
mkosi.extra/root/
10131013
cat <<- 'EOF' > mkosi.postinst
10141014
#!/bin/sh
10151015
# v14: 'systemd-nspawn"; v15: "mkosi"
10161016
printf 'container=%s\n' "$container"
10171017
# .postinst and others moved outside container in mkosi v15, see
10181018
# https://github.com/systemd/mkosi/commit/9b626c647037bc8a
10191019
if [ -n "$container" ]; then
1020-
/root/ndctl/reinstall.sh
1020+
/root/reinstall_ndctl.sh
10211021
else
10221022
# The magic, short-lived $SCRIPT variable is already deprecated
10231023
# and we don't need it.
1024-
mkosi-chroot /root/ndctl/reinstall.sh
1024+
mkosi-chroot /root/reinstall_ndctl.sh
10251025
fi
10261026
EOF
10271027
chmod +x mkosi.postinst

0 commit comments

Comments
 (0)