···

       
45
       
 
       
      "--with-tty-gid=3" # tty in NixOS has gid 3

     

       
46
       
 
       
      "--disable-networkd" # enable/use eventually

     

       
47
       
 
       
      "--enable-compat-libs" # get rid of this eventually

     

       
0
       
 
       

     

       
48
       
 
       
    ];

     

       
49
       
 
       


     

       
50
       
 
       
  preConfigure =

     
···

       
59
       
 
       
          --replace /bin/umount ${utillinux}/bin/umount \

     

       
60
       
 
       
          --replace /sbin/swapon ${utillinux}/sbin/swapon \

     

       
61
       
 
       
          --replace /sbin/swapoff ${utillinux}/sbin/swapoff \

     

       
62
       
-
       
          --replace /sbin/fsck ${utillinux}/sbin/fsck \

     

       
63
       
 
       
          --replace /bin/echo ${coreutils}/bin/echo \

     

       
64
       
 
       
          --replace /bin/cat ${coreutils}/bin/cat \

     

       
65
       
 
       
          --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \

     

···

       
45
       
 
       
      "--with-tty-gid=3" # tty in NixOS has gid 3

     

       
46
       
 
       
      "--disable-networkd" # enable/use eventually

     

       
47
       
 
       
      "--enable-compat-libs" # get rid of this eventually

     

       
48
       
+
       
      "--disable-tests"

     

       
49
       
 
       
    ];

     

       
50
       
 
       


     

       
51
       
 
       
  preConfigure =

     
···

       
60
       
 
       
          --replace /bin/umount ${utillinux}/bin/umount \

     

       
61
       
 
       
          --replace /sbin/swapon ${utillinux}/sbin/swapon \

     

       
62
       
 
       
          --replace /sbin/swapoff ${utillinux}/sbin/swapoff \

     

       
0
       
 
       

     

       
63
       
 
       
          --replace /bin/echo ${coreutils}/bin/echo \

     

       
64
       
 
       
          --replace /bin/cat ${coreutils}/bin/cat \

     

       
65
       
 
       
          --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \

     

···

       
94
       
 
       
 #ifndef HAVE_SPLIT_USR

     

       
95
       
 
       
                     || path_equal(m->path, "/usr")

     

       
96
       
 
       
 #endif

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
97
       
 
       
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c

     

       
98
       
 
       
index 9a9ed9d..9e46e18 100644

     

       
99
       
 
       
--- a/src/nspawn/nspawn.c

     
···

       
129
       
 
       
                 if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)

     

       
130
       
 
       
                         continue;

     

       
131
       
 
       
 

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
132
       
 
       
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c

     

       
133
       
 
       
index 0887bc3..6b502ce 100644

     

       
134
       
 
       
--- a/src/systemctl/systemctl.c

     

···

       
94
       
 
       
 #ifndef HAVE_SPLIT_USR

     

       
95
       
 
       
                     || path_equal(m->path, "/usr")

     

       
96
       
 
       
 #endif

     

       
97
       
+
       
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c

     

       
98
       
+
       
index 18f2aca..2a2b1ea 100644

     

       
99
       
+
       
--- a/src/fsck/fsck.c

     

       
100
       
+
       
+++ b/src/fsck/fsck.c

     

       
101
       
+
       
@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {

     

       
102
       
+
       
 

     

       
103
       
+
       
         type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");

     

       
104
       
+
       
         if (type) {

     

       
105
       
+
       
-                const char *checker = strappenda("/sbin/fsck.", type);

     

       
106
       
+
       
+                const char *checker = strappenda("/run/current-system/sw/sbin/fsck.", type);

     

       
107
       
+
       
                 r = access(checker, X_OK);

     

       
108
       
+
       
                 if (r < 0) {

     

       
109
       
+
       
                         if (errno == ENOENT) {

     

       
110
       
+
       
@@ -302,7 +302,7 @@ int main(int argc, char *argv[]) {

     

       
111
       
+
       
                         return EXIT_FAILURE;

     

       
112
       
+
       
                 }

     

       
113
       
+
       
 

     

       
114
       
+
       
-        cmdline[i++] = "/sbin/fsck";

     

       
115
       
+
       
+        cmdline[i++] = "/run/current-system/sw/sbin/fsck";

     

       
116
       
+
       
         cmdline[i++] = "-a";

     

       
117
       
+
       
         cmdline[i++] = "-T";

     

       
118
       
+
       
         cmdline[i++] = "-l";

     

       
119
       
 
       
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c

     

       
120
       
 
       
index 9a9ed9d..9e46e18 100644

     

       
121
       
 
       
--- a/src/nspawn/nspawn.c

     
···

       
151
       
 
       
                 if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)

     

       
152
       
 
       
                         continue;

     

       
153
       
 
       
 

     

       
154
       
+
       
diff --git a/src/shared/generator.c b/src/shared/generator.c

     

       
155
       
+
       
index 6110303..e679cb1 100644

     

       
156
       
+
       
--- a/src/shared/generator.c

     

       
157
       
+
       
+++ b/src/shared/generator.c

     

       
158
       
+
       
@@ -48,7 +48,7 @@ int generator_write_fsck_deps(

     

       
159
       
+
       
                 const char *checker;

     

       
160
       
+
       
                 int r;

     

       
161
       
+
       
 

     

       
162
       
+
       
-                checker = strappenda("/sbin/fsck.", fstype);

     

       
163
       
+
       
+                checker = strappenda("/run/current-system/sw/sbin/fsck.", fstype);

     

       
164
       
+
       
                 r = access(checker, X_OK);

     

       
165
       
+
       
                 if (r < 0) {

     

       
166
       
+
       
                         log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);

     

       
167
       
 
       
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c

     

       
168
       
 
       
index 0887bc3..6b502ce 100644

     

       
169
       
 
       
--- a/src/systemctl/systemctl.c