2 files changed, 4 insertions, 3 deletions

diff --git a/archival/dpkg.c b/archival/dpkg.c
index e50f94ae6..dc9db92e6 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1864,7 +1864,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        chdir_system_drive();
+        xchdir_system_drive();
 
         /* initialise data store */
         path = xstrdup(DPKG_DIR "/info");
diff --git a/archival/rpm.c b/archival/rpm.c
index c2f0550ff..81b3248d1 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -308,9 +308,10 @@ static void extract_cpio(int fd, const char *source_rpm)
         if (source_rpm != NULL) {
                 /* Binary rpm (it was built from some SRPM), install to root */
 #if ENABLE_PLATFORM_MINGW32
-                if (chdir_system_drive())
-#endif
+                xchdir_system_drive();
+#else
                 xchdir("/");
+#endif
         } /* else: SRPM, install to current dir */
 
         /* Initialize */