From: Kern Sibbald Date: Sat, 3 Apr 2004 21:26:49 +0000 (+0000) Subject: Update doc X-Git-Tag: Release-1.34.0~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9524603efee72753d6e5fd1861ba86b8e17ce205;p=bacula%2Fbacula Update doc git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1178 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/kernstodo b/bacula/kernstodo index 44e444bd57..6363437a6c 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -62,12 +62,11 @@ For 1.33 Testing/Documentation: For 1.33 - Complete Win32 installer + +For version 1.35: - Finish work on Gnome restore GUI. - Fix "llist jobid=xx" where no fileset or client exists. -- Test work on conio.c -- particularly linking. - ---- Maybe in 1.33 -From Chris Hull: +- From Chris Hull: it seems to be complaining about 12:00pm which should be a valid 12 hour time. I changed the time to 11:59am and everything works fine. Also 12:00am works fine. 0:00pm also works (which I don't think @@ -78,9 +77,6 @@ From Chris Hull: - Add all pools in Dir conf to DB also update them to catch changed LabelFormats and such. - Update volumes FromPool=xxx does all volumes. - - -For version 1.35: - Pass Director resource name as an option to the Console. - Add a "batch" mode to the Console (no unsolicited queries, ...). - Add code to check for tape alerts -- tapeinfo. @@ -1423,4 +1419,4 @@ Block Position: 0 - Check time/dates printed during restore when using Win32 API. - Once a job is canceled, make sure the status reflects that even if the job is "stuck" in the run queue. - +- Test work on conio.c -- particularly linking. diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c index 5b5cc57514..7d6646305d 100755 --- a/bacula/src/console/conio.c +++ b/bacula/src/console/conio.c @@ -841,12 +841,12 @@ static void rawmode(FILE *input) if (!termtype) { printf("Cannot get terminal type.\n"); normode(); - _exit(1); + exit(1); } if (tgetent(term_buffer, termtype) < 0) { printf("Cannot get terminal termcap entry.\n"); normode(); - _exit(1); + exit(1); } t_width = t_height = -1; t_width = tgetnum("co") - 1; @@ -996,9 +996,9 @@ void clrbrk() static void sigintcatcher(int sig) { brkflg++; - if (brkflg > 1) { + if (brkflg > 3) { normode(); - _exit(1); + exit(1); } signal(SIGINT, sigintcatcher); } diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c index b3077d05c2..5393df16a1 100755 --- a/bacula/src/filed/status.c +++ b/bacula/src/filed/status.c @@ -222,7 +222,7 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sa dt, JobName); sendit(buf, strlen(buf), arg); } - sendit("====\n", 1, arg); + sendit("====\n", 5, arg); unlock_last_jobs_list(); } diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c index 48e65c8d47..a636a7440c 100644 --- a/bacula/src/lib/signal.c +++ b/bacula/src/lib/signal.c @@ -64,7 +64,7 @@ static void signal_handler(int sig) /* If we come back more than once, get out fast! */ if (already_dead > 1) { - _exit(1); + exit(1); } /* If we come back once, take normal exit */ if (already_dead) { diff --git a/bacula/src/win32/Start.bat b/bacula/src/win32/Start.bat new file mode 100644 index 0000000000..848470b1ef --- /dev/null +++ b/bacula/src/win32/Start.bat @@ -0,0 +1,5 @@ +rem +rem Bacula start file for Win95/98/Me +rem +cd c:\bacula\bin +c:\bacula\bin\bacula-fd.exe /service -c c:\bacula\bin\bacula-fd.conf diff --git a/bacula/src/win32/Stop.bat b/bacula/src/win32/Stop.bat new file mode 100644 index 0000000000..4071e9d3ed --- /dev/null +++ b/bacula/src/win32/Stop.bat @@ -0,0 +1,5 @@ +rem +rem Bacula stop file for Win95/98/Me +rem +cd c:\bacula\bin +c:\bacula\bin\bacula-fd.exe /kill diff --git a/bacula/src/win32/winbacula.nsi.in b/bacula/src/win32/winbacula.nsi.in index 736d1838a7..c401399a03 100755 --- a/bacula/src/win32/winbacula.nsi.in +++ b/bacula/src/win32/winbacula.nsi.in @@ -94,7 +94,6 @@ Section "Bacula File Service" SecService newconf: File /oname=bacula-fd.conf.new bacula-fd.conf - ; If /service was given jump to the service install part do_service: Push "/service" @@ -142,6 +141,8 @@ Section "Bacula File Service" SecService Exec 'net start bacula' goto NoStart do_win98: + File Start.bat + File Stop.bat MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to start the Bacula Client now?" IDNO NoStart Start: Exec '"$INSTDIR\bin\bacula-fd.exe" -c "$INSTDIR\bin\bacula-fd.conf"' @@ -151,6 +152,11 @@ SectionEnd Section "Install Documentation" SecDoc + SetOutPath "$INSTDIR\doc" + CreateDirectory "$INSTDIR\doc" + File ..\..\doc\html-manual\*.html + File ..\..\doc\html-manual\*.gif + File ..\..\doc\html-manual\*.jpg SectionEnd ; @@ -158,7 +164,7 @@ SectionEnd ; LangString DESC_SecService ${LANG_ENGLISH} "Install Bacula client on this system." - LangString DESC_SecDoc ${LANG_ENGLISH} "Install Documenation (not implemented)." + LangString DESC_SecDoc ${LANG_ENGLISH} "Install Documenation on this system." !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService) @@ -189,6 +195,7 @@ Section "Uninstall" ; remove files and uninstaller (preserving config for now) CopyFiles /SILENT "$INSTDIR\bin\bacula-fd.conf" "$INSTDIR\bacula-fd.conf" Delete /REBOOTOK "$INSTDIR\bin\*.*" + Delete /REBOOTOK "$INSTDIR\doc\*.*" CopyFiles /SILENT "$INSTDIR\bacula-fd.conf" "$INSTDIR\bin\bacula-fd.conf" Delete /REBOOTOK "$INSTDIR\bacula-fd.conf" Delete /REBOOTOK "$INSTDIR\Uninstall.exe" @@ -198,18 +205,12 @@ Section "Uninstall" Delete /REBOOTOK "$INSTDIR\bin\bacula-fd.conf" ; remove directories used RMDir "$INSTDIR\bin" + RMDir "$INSTDIR\doc" RMDir "$INSTDIR\working" RMDir "$INSTDIR" RMDir "C:\tmp" LeaveConfig: - ; If we need to reboot we'll ask - IfRebootFlag Reboot Continue - Reboot: - MessageBox MB_YESNO|MB_ICONQUESTION "Some files will only be deleted after restarting. Reboot now?" IDNO Continue - Reboot - Continue: - SectionEnd ; eof