wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-02 22:13:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Check result of fsck before attempting remounting / read-write

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2020-04-26 21:45:12 +02:00
parent 317fe7aceb
commit e02f8cf353
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/finit.c
+8 -8
View File
@@ -90,8 +90,9 @@ static void banner(void)
*/
static int fsck(int pass)
{
// int save;
struct fstab *fs;
// int save;
int rc = 0;
if (!setfsent()) {
_pe("Failed opening fstab");
@@ -122,14 +123,14 @@ static int fsck(int pass)
}
snprintf(cmd, sizeof(cmd), "fsck -a %s", fs->fs_spec);
run_interactive(cmd, "Checking filesystem %.13s", fs->fs_spec);
rc += run_interactive(cmd, "Checking filesystem %.13s", fs->fs_spec);
}
// if (save)
// log_debug();
endfsent();
return 0;
return rc;
}
/*
@@ -371,14 +372,13 @@ int main(int argc, char *argv[])
banner();
/*
* Check file filesystems in /etc/fstab
* Check file systems listed with pass > 0 in /etc/fstab
*/
rc = 0;
for (int pass = 1; pass < 10 && !rescue; pass++) {
if (fsck(pass)) {
rc++;
rc = fsck(pass);
if (rc)
break;
}
}
/*
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
continue;
if (strcmp(fs->fs_type, "ro")) {
if (!rc)
if (rc)
print(1, "Cannot remount / as read-write, fsck failed before");
else
rc = run_interactive("mount -n -o remount,rw /", "Remounting / as read-write");