ci: test cleaninstall target as part of BASIC tests

Fix issues in the configure and Makefile exposed by this new test
coverage.

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 3ae04e631ccb6efea403befdfeb522b9cdf7d32c..ed0f3617fad4eb1f89d35c554422596e48170c06 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -48,7 +48,7 @@ jobs:
             -   name: "Checkout Repository"
                 uses: actions/checkout@v4
             -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-                run:  TARGETS='all install check' DRACUT=dracut ./test/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+                run:  TARGETS='all install cleaninstall check' DRACUT=dracut ./test/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
 
     # syncheck
     syncheck:

diff --git a/Makefile b/Makefile
index 0bbef19e31ddb773f45cd58ddd5f25ceaa80d850..d7e265e5c25f98923e08f8054b8e4ab81b8db978 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ endif
                ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98dracut-systemd/dracut-shutdown-onfailure.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown-onfailure.service; \
                ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98dracut-systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
                mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants; \
-               ln -s ../dracut-shutdown.service \
+               ln -sf ../dracut-shutdown.service \
                $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/dracut-shutdown.service; \
                mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
                for i in \
@@ -203,7 +203,7 @@ endif
                    dracut-pre-udev.service \
                    ; do \
                        ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98dracut-systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
-                       ln -s ../$$i \
+                       ln -sf ../$$i \
                        $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
                done \
        fi

diff --git a/configure b/configure
index ff3d4c831edbd0257241bbd048037799595feae7..bd4f918503c051f1407d94a335c1dc546f3f5cfb 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,6 +14,11 @@ else
     enable_dracut_cpio=no
 fi
 
+# set systemdsystemunitdir on systemd-based systems
+if [ -d /usr/lib/systemd/system ]; then
+    systemdsystemunitdir=/usr/lib/systemd/system
+fi
+
 CC="${CC:-cc}"
 PKG_CONFIG="${PKG_CONFIG:-pkg-config}"