diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-12 13:31:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-12 13:31:41 +0000 |
| commit | 17a2f763a4c98da908e06f78f3e75655fbc1aa65 (patch) | |
| tree | 7e9318855ee15b44b066cbcb50afaf0d8b2d7bc3 | |
| parent | 6cf928fcc1227753f6f4e7da0ae50968efb037b8 (diff) | |
| download | drakx-17a2f763a4c98da908e06f78f3e75655fbc1aa65.tar drakx-17a2f763a4c98da908e06f78f3e75655fbc1aa65.tar.gz drakx-17a2f763a4c98da908e06f78f3e75655fbc1aa65.tar.bz2 drakx-17a2f763a4c98da908e06f78f3e75655fbc1aa65.tar.xz drakx-17a2f763a4c98da908e06f78f3e75655fbc1aa65.zip | |
fix buggy blino commit which caused install failures to cause reboot without prompting
| -rw-r--r-- | mdk-stage1/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 81252a0ea..f5a46010b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -352,7 +352,7 @@ void unmount_filesystems(void) continue; #endif printf("\tumount failed: %s\n", fs[i].name); - if (strcmp(fs[i].fs, "ext2") == 0) nb++; /* don't count not-ext2 umount failed */ + if (strcmp(fs[i].fs, "ext3") == 0) nb++; /* don't count not-ext3 umount failed */ } #ifdef MANDRAKE_MOVE @@ -527,7 +527,6 @@ int main(int argc, char **argv) if (in_reboot()) { // any exitcode is valid if we're in_reboot - abnormal_termination = 1; } else if (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_proceed) { kill(klog_pid, 9); printf("proceeding, please wait...\n"); @@ -537,6 +536,7 @@ int main(int argc, char **argv) if (WIFSIGNALED(wait_status)) printf("-- received signal %d", WTERMSIG(wait_status)); printf("\n"); + abnormal_termination = 1; } if (!abnormal_termination) { |