missing mount cmd confuses guestfish
by Olaf Hering
I think calling "sh" before "mount" should not confuse guestfish like
that:
# guestfish (1.20.4 on sles11sp3)
Welcome to guestfish, the libguestfs filesystem interactive shell for
editing virtual machine filesystems.
Type: 'help' for help on commands
'man' to read the manual
'quit' to quit the shell
><fs> add-drive /dev/shm/olaf/vdisk-sles11sp2_full_fate310510-disk0
><fs> launch
100% ⟦▒⟧ 00:00
><fs> sh "cd / ; chroot / ; /bin/pwd"
libguestfs: error: sh: do_command: you must call 'mount' first to mount the root filesystem
><fs> mount /dev/sda2 /
libguestfs: error: mount: call launch before using this function\n(in guestfish, don't forget to use the 'run' command)
><fs> launch
libguestfs: error: you must call guestfs_add_drive before guestfs_launch
><fs>
Olaf
11 years, 4 months
--disable-appliance creates supermin.d files
by Olaf Hering
Why does the toplevel Makefile process appliance/, and creates
supermin.d during make install, whith configure --disable-appliance? I
have to double check what actually happens, it seems it causes startup
failures if the resulting binary packages are started on a host that
happens to have supermin installed.
Olaf
11 years, 4 months
Language Translation Needs - ITC Global Translations
by Allison PAXTON
Français ( "http://www.itcglobaltranslations.com/email/itcusa/french/index.html" ) - Español ( "http://www.itcglobaltranslations.com/email/itcusa/spanish/index.html" ) - Deutsch ( "http://www.itcglobaltranslations.com/email/itcusa/german/index.html" )
Hello,
I got your details from the Internet. Apologies for the unsolicited contact.
Our translation company, ITC Global Translations ( "http://www.itcglobaltranslations.com/" ), is interested in collaborating with your organization on your international translation projects. Would you mind forwarding this email to the person supervising the translation of your documents as well as to your marketing and compliance teams?
ITC is a translation company able to provide highly technical translation services in over 35 languages. With our 15 years of experience working for international companies and our offices in Europe and in the United States, we have built a solid reputation as well as a client list including such well-known organizations as Cap Gemini, Johnson Controls, Emerson Process, John Deere, Haulotte, Sciemetric, Toyota, Pfizer, Covidien, Publicis, l’Oreal, Nestle, Sanofi,World Health Organization (WHO) , Covidien, Pfizer, Averion, Alstom, Publicis, World Trade Center Association, and the United Nations, to name a few.
Technical document translations: user manuals, package inserts, technical documentation, device interfaces (GUIs), help systems, labels, troubleshooting guides, work instructions, specifications documents etc. Medical/Pharmaceutical document translations: of protocol & medical writings, investigator brochure, clinical trial monitoring, case report forms, compliance and safety testing documentation, trial documents, regulatory documentation, drug registration documentation, market authorizations, informed consent forms, patient questionnaires, toxicology reports, safety reports and clinical study reports, IFUs and inserts, etc. Marketing document translations: brochures, questionnaires, package inserts, packaging/labels, websites, press releases, white papers, etc. Legal document translations: patents, legal proceedings, contracts, treaties, laws and regulations, expert reports, non-disclosure agreements, etc.Please let me know if you need additional information and if we could assist you.
I look forward to hearing from you.
Best Regards,
Allison Paxton
( "mailto:allison.paxton@itcglobaltranslations.com?subject=More%20Information" ) Allison PAXTON ( "mailto:allison.paxton@itcglobaltranslations.com?subject=More%20Information" ) | ITC Global Translations | Bus. Development Mgr.
ITC USA | www.itcglobaltranslations.com ( "http://www.itcglobaltranslations.com" ) | Tel +1 561 746 6242
ITC France | www.itcfrance.com ( "http://www.itcfrance.com" ) | Tél. +33 (0)4 78 33 02 55
( "http://www.facebook.com/pages/ITC-Global-Translations/306360709389768" )( "http://twitter.com/ITCtranslations" )( "http://www.linkedin.com/company/itc-global-translations" )
If you no longer wish to receive emails from ITC, please click here to unsubscribe ( "mailto:allison.paxton@itcglobaltranslation.com?subject=unsubscribe" ).
© 2013 ITC Global Translations USA, Inc. ( "http://www.itcglobaltranslations.com/" ) 900 E Indiantown Rod, Ste. 302, Jupiter FL 33477. All rights reserved
11 years, 4 months
[PATCH 1/3] Rationalise whitespace to 4 space indentation with no trailing spaces
by Matthew Booth
RHSrvAny.c was using a mixture of 4 space indentation, and tabs with a width of
4. This commit rationalises the whitespace to use only 4 space indentation, and
removes trailing whitespace.
---
RHSrvAny/RHSrvAny.c | 537 ++++++++++++++++++++++++++--------------------------
RHSrvAny/RHSrvAny.h | 1 -
RHSrvAny/resource.h | 2 +-
3 files changed, 269 insertions(+), 271 deletions(-)
diff --git a/RHSrvAny/RHSrvAny.c b/RHSrvAny/RHSrvAny.c
index 3d4c3b4..a28f973 100644
--- a/RHSrvAny/RHSrvAny.c
+++ b/RHSrvAny/RHSrvAny.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4 -*- */
/* RHSrvAny - Turn any Windows program into a Windows service.
* Written by Yuval Kashtan.
* Copyright (C) 2010 Red Hat Inc.
@@ -42,82 +41,82 @@
#define SVCNAME TEXT("RHSrvAny")
-SERVICE_STATUS gSvcStatus;
+SERVICE_STATUS gSvcStatus;
HANDLE ghSvcStopEvent = NULL;
-SERVICE_STATUS_HANDLE gSvcStatusHandle;
+SERVICE_STATUS_HANDLE gSvcStatusHandle;
VOID SvcInstall (void);
-VOID WINAPI SvcCtrlHandler (DWORD);
-VOID WINAPI SvcMain (DWORD, LPTSTR *);
+VOID WINAPI SvcCtrlHandler (DWORD);
+VOID WINAPI SvcMain (DWORD, LPTSTR *);
VOID SvcReportEvent (LPTSTR);
-VOID SvcInit (DWORD, LPTSTR *);
+VOID SvcInit (DWORD, LPTSTR *);
VOID ReportSvcStatus (DWORD, DWORD, DWORD);
int
main (int argc, char **a_argv)
-{
+{
/* For compatibility with MinGW, see:
- http://demosten-eng.blogspot.com/2008/08/mingw-and-unicode-support.html */
+ http://demosten-eng.blogspot.com/2008/08/mingw-and-unicode-support.html */
TCHAR **argv;
- argv = CommandLineToArgvW (GetCommandLineW (), &argc);
-
- SERVICE_TABLE_ENTRY DispatchTable[] = {
- {
- SVCNAME,
- (LPSERVICE_MAIN_FUNCTION) SvcMain
- },
- { NULL, NULL }
- };
-
- if(
- lstrcmpi(
- argv[1],
- TEXT("install")
- ) == 0
- ) {
- SvcInstall();
- return EXIT_SUCCESS;
- }
-
- if (!StartServiceCtrlDispatcher( DispatchTable ))
- {
- SvcReportEvent(TEXT("StartServiceCtrlDispatcher"));
- return EXIT_FAILURE;
+ argv = CommandLineToArgvW (GetCommandLineW (), &argc);
+
+ SERVICE_TABLE_ENTRY DispatchTable[] = {
+ {
+ SVCNAME,
+ (LPSERVICE_MAIN_FUNCTION) SvcMain
+ },
+ { NULL, NULL }
+ };
+
+ if(
+ lstrcmpi(
+ argv[1],
+ TEXT("install")
+ ) == 0
+ ) {
+ SvcInstall();
+ return EXIT_SUCCESS;
}
- return EXIT_SUCCESS;
-}
+ if (!StartServiceCtrlDispatcher( DispatchTable ))
+ {
+ SvcReportEvent(TEXT("StartServiceCtrlDispatcher"));
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
-VOID
+VOID
SvcInstall() {
- SC_HANDLE schSCManager;
- SC_HANDLE schService;
- TCHAR szPath[MAX_PATH];
-
- if (
- !GetModuleFileName(
- NULL,
- szPath,
- MAX_PATH
- )
- ) {
- printf("Cannot install service (%d)\n", (int) GetLastError());
- return;
- }
-
- schSCManager = OpenSCManager(
- NULL,
- NULL,
- SC_MANAGER_ALL_ACCESS
- );
-
+ SC_HANDLE schSCManager;
+ SC_HANDLE schService;
+ TCHAR szPath[MAX_PATH];
+
+ if (
+ !GetModuleFileName(
+ NULL,
+ szPath,
+ MAX_PATH
+ )
+ ) {
+ printf("Cannot install service (%d)\n", (int) GetLastError());
+ return;
+ }
+
+ schSCManager = OpenSCManager(
+ NULL,
+ NULL,
+ SC_MANAGER_ALL_ACCESS
+ );
+
if (NULL == schSCManager) {
- printf("OpenSCManager failed (%d)\n", (int) GetLastError());
- return;
+ printf("OpenSCManager failed (%d)\n", (int) GetLastError());
+ return;
}
- schService = CreateService (
+ schService = CreateService (
schSCManager,
SVCNAME,
SVCNAME,
@@ -131,212 +130,212 @@ SvcInstall() {
NULL,
NULL,
NULL
- );
-
+ );
+
if (schService == NULL) {
printf (
- "CreateService failed (%d)\n",
- (int) GetLastError()
- );
+ "CreateService failed (%d)\n",
+ (int) GetLastError()
+ );
CloseServiceHandle (schSCManager);
return;
}
- else {
- printf("Service installed successfully\n");
- }
+ else {
+ printf("Service installed successfully\n");
+ }
- CloseServiceHandle (schService);
+ CloseServiceHandle (schService);
CloseServiceHandle (schSCManager);
}
-VOID
-WINAPI
+VOID
+WINAPI
SvcMain (
- DWORD dwArgc,
- LPTSTR *lpszArgv
+ DWORD dwArgc,
+ LPTSTR *lpszArgv
) {
- gSvcStatusHandle = RegisterServiceCtrlHandler (
- SVCNAME,
- SvcCtrlHandler
- );
-
- if (!gSvcStatusHandle) {
- SvcReportEvent(TEXT("RegisterServiceCtrlHandler"));
- return;
- }
-
- gSvcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
- gSvcStatus.dwServiceSpecificExitCode = 0;
-
- ReportSvcStatus (
- SERVICE_START_PENDING,
- NO_ERROR,
- 3000
- );
-
- SvcInit (
- dwArgc,
- lpszArgv
- );
+ gSvcStatusHandle = RegisterServiceCtrlHandler (
+ SVCNAME,
+ SvcCtrlHandler
+ );
+
+ if (!gSvcStatusHandle) {
+ SvcReportEvent(TEXT("RegisterServiceCtrlHandler"));
+ return;
+ }
+
+ gSvcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+ gSvcStatus.dwServiceSpecificExitCode = 0;
+
+ ReportSvcStatus (
+ SERVICE_START_PENDING,
+ NO_ERROR,
+ 3000
+ );
+
+ SvcInit (
+ dwArgc,
+ lpszArgv
+ );
}
BOOL
RegistryRead (
- HKEY hHive,
- wchar_t *szKeyPath,
- wchar_t *szValue,
- wchar_t *szData,
- DWORD *nSize
+ HKEY hHive,
+ wchar_t *szKeyPath,
+ wchar_t *szValue,
+ wchar_t *szData,
+ DWORD *nSize
) {
- HKEY hKey;
- long lSuccess;
-
- lSuccess = RegOpenKey (
- hHive,
- szKeyPath,
- &hKey
- );
-
- if (lSuccess == ERROR_SUCCESS) {
- lSuccess = RegQueryValueEx (
- hKey,
- szValue,
- NULL,
- NULL,
- (LPBYTE) szData,
- nSize
- );
-
- if (lSuccess == ERROR_SUCCESS) {
- return (TRUE);
- }
- }
-
- return (FALSE);
+ HKEY hKey;
+ long lSuccess;
+
+ lSuccess = RegOpenKey (
+ hHive,
+ szKeyPath,
+ &hKey
+ );
+
+ if (lSuccess == ERROR_SUCCESS) {
+ lSuccess = RegQueryValueEx (
+ hKey,
+ szValue,
+ NULL,
+ NULL,
+ (LPBYTE) szData,
+ nSize
+ );
+
+ if (lSuccess == ERROR_SUCCESS) {
+ return (TRUE);
+ }
+ }
+
+ return (FALSE);
}
-VOID
+VOID
SvcInit (
- DWORD dwArgc,
- LPTSTR *lpszArgv
+ DWORD dwArgc,
+ LPTSTR *lpszArgv
) {
- DWORD nSize;
- BOOL fSuccess;
+ DWORD nSize;
+ BOOL fSuccess;
STARTUPINFO si;
- wchar_t szPWD[1024];
+ wchar_t szPWD[1024];
PROCESS_INFORMATION pi;
- wchar_t szCmdLine[1024];
- wchar_t szRegistryPath[1024];
+ wchar_t szCmdLine[1024];
+ wchar_t szRegistryPath[1024];
- // TO_DO: Declare and set any required variables.
- // Be sure to periodically call ReportSvcStatus() with
+ // TO_DO: Declare and set any required variables.
+ // Be sure to periodically call ReportSvcStatus() with
// SERVICE_START_PENDING. If initialization fails, call
// ReportSvcStatus with SERVICE_STOPPED.
// Create an event. The control handler function, SvcCtrlHandler,
// signals this event when it receives the stop control code.
- ghSvcStopEvent = CreateEvent (
- NULL,
- TRUE,
- FALSE,
- NULL
- );
+ ghSvcStopEvent = CreateEvent (
+ NULL,
+ TRUE,
+ FALSE,
+ NULL
+ );
if (ghSvcStopEvent == NULL) {
ReportSvcStatus (
- SERVICE_STOPPED,
- NO_ERROR,
- 0
- );
+ SERVICE_STOPPED,
+ NO_ERROR,
+ 0
+ );
return;
}
// Report running status when initialization is complete.
ReportSvcStatus (
- SERVICE_RUNNING,
- NO_ERROR,
- 0
- );
+ SERVICE_RUNNING,
+ NO_ERROR,
+ 0
+ );
// TO_DO: Perform work until service stops.
ZeroMemory( &si, sizeof(si) );
si.cb = sizeof(si);
ZeroMemory( &pi, sizeof(pi) );
- nSize=1024;
+ nSize=1024;
#ifdef HAVE_SWPRINTF_S
- swprintf_s (
- szRegistryPath,
- nSize,
+ swprintf_s (
+ szRegistryPath,
+ nSize,
#else
- snwprintf (
- szRegistryPath,
- sizeof szRegistryPath,
+ snwprintf (
+ szRegistryPath,
+ sizeof szRegistryPath,
#endif
- L"SYSTEM\\CurrentControlSet\\services\\%s\\Parameters",
- SVCNAME
- );
-
- fSuccess = RegistryRead (
- HKEY_LOCAL_MACHINE,
- szRegistryPath,
- L"CommandLine",
- szCmdLine,
- &nSize
- );
-
- if (fSuccess) {
- fSuccess = RegistryRead (
- HKEY_LOCAL_MACHINE,
- szRegistryPath,
- L"PWD",
- szPWD,
- &nSize
- );
- }
-
- if (fSuccess) {
- fSuccess = CreateProcess (
- NULL,
- szCmdLine,
- NULL,
- NULL,
- FALSE,
- (
- CREATE_NO_WINDOW
- ),
- NULL,
- szPWD,
- &si,
- &pi
- );
- }
-
- // treat errors
+ L"SYSTEM\\CurrentControlSet\\services\\%s\\Parameters",
+ SVCNAME
+ );
+
+ fSuccess = RegistryRead (
+ HKEY_LOCAL_MACHINE,
+ szRegistryPath,
+ L"CommandLine",
+ szCmdLine,
+ &nSize
+ );
+
+ if (fSuccess) {
+ fSuccess = RegistryRead (
+ HKEY_LOCAL_MACHINE,
+ szRegistryPath,
+ L"PWD",
+ szPWD,
+ &nSize
+ );
+ }
+
+ if (fSuccess) {
+ fSuccess = CreateProcess (
+ NULL,
+ szCmdLine,
+ NULL,
+ NULL,
+ FALSE,
+ (
+ CREATE_NO_WINDOW
+ ),
+ NULL,
+ szPWD,
+ &si,
+ &pi
+ );
+ }
+
+ // treat errors
while(1)
{
// Check whether to stop the service.
WaitForSingleObject (
- ghSvcStopEvent,
- INFINITE
- );
+ ghSvcStopEvent,
+ INFINITE
+ );
ReportSvcStatus (
- SERVICE_STOPPED,
- NO_ERROR,
- 0
- );
+ SERVICE_STOPPED,
+ NO_ERROR,
+ 0
+ );
return;
}
}
VOID ReportSvcStatus (
- DWORD dwCurrentState,
- DWORD dwWin32ExitCode,
- DWORD dwWaitHint
+ DWORD dwCurrentState,
+ DWORD dwWin32ExitCode,
+ DWORD dwWaitHint
) {
static DWORD dwCheckPoint = 1;
@@ -345,99 +344,99 @@ VOID ReportSvcStatus (
gSvcStatus.dwWin32ExitCode = dwWin32ExitCode;
gSvcStatus.dwWaitHint = dwWaitHint;
- if (dwCurrentState == SERVICE_START_PENDING) {
- gSvcStatus.dwControlsAccepted = 0;
- }
- else {
- gSvcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
- }
-
- if (
- (dwCurrentState == SERVICE_RUNNING) ||
- (dwCurrentState == SERVICE_STOPPED)
- ) {
- gSvcStatus.dwCheckPoint = 0;
- } else {
- gSvcStatus.dwCheckPoint = dwCheckPoint++;
- }
-
- // Report the status of the service to the SCM.
- SetServiceStatus (
- gSvcStatusHandle,
- &gSvcStatus
- );
+ if (dwCurrentState == SERVICE_START_PENDING) {
+ gSvcStatus.dwControlsAccepted = 0;
+ }
+ else {
+ gSvcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+ }
+
+ if (
+ (dwCurrentState == SERVICE_RUNNING) ||
+ (dwCurrentState == SERVICE_STOPPED)
+ ) {
+ gSvcStatus.dwCheckPoint = 0;
+ } else {
+ gSvcStatus.dwCheckPoint = dwCheckPoint++;
+ }
+
+ // Report the status of the service to the SCM.
+ SetServiceStatus (
+ gSvcStatusHandle,
+ &gSvcStatus
+ );
}
-VOID
-WINAPI
+VOID
+WINAPI
SvcCtrlHandler (
- DWORD dwCtrl
+ DWORD dwCtrl
) {
- switch(dwCtrl) {
- case SERVICE_CONTROL_STOP:
+ switch(dwCtrl) {
+ case SERVICE_CONTROL_STOP:
ReportSvcStatus(SERVICE_STOP_PENDING, NO_ERROR, 0);
/* Signal the service to stop. */
SetEvent(ghSvcStopEvent);
-
+
return;
-
- case SERVICE_CONTROL_INTERROGATE:
+
+ case SERVICE_CONTROL_INTERROGATE:
/* Fall through to send current status. */
- break;
-
- default:
break;
- }
+
+ default:
+ break;
+ }
ReportSvcStatus(gSvcStatus.dwCurrentState, NO_ERROR, 0);
}
/* Logs messages to the event log */
-VOID
+VOID
SvcReportEvent (
- LPTSTR szFunction
-) {
+ LPTSTR szFunction
+) {
TCHAR Buffer[80];
HANDLE hEventSource;
LPCTSTR lpszStrings[2];
hEventSource = RegisterEventSource (
- NULL,
- SVCNAME
- );
+ NULL,
+ SVCNAME
+ );
if (
- NULL != hEventSource
- ) {
+ NULL != hEventSource
+ ) {
#ifdef HAVE_STRINGCCHPRINTF
- StringCchPrintf
+ StringCchPrintf
#else
- snwprintf
+ snwprintf
#endif
- (
- Buffer,
- 80,
- TEXT("%s failed with %d"),
- szFunction,
- GetLastError()
- );
+ (
+ Buffer,
+ 80,
+ TEXT("%s failed with %d"),
+ szFunction,
+ GetLastError()
+ );
lpszStrings[0] = SVCNAME;
lpszStrings[1] = Buffer;
- ReportEvent (
- hEventSource,
- EVENTLOG_ERROR_TYPE,
- 0,
- SVC_ERROR,
- NULL,
- 2,
- 0,
- lpszStrings,
- NULL
- );
-
- DeregisterEventSource (hEventSource);
+ ReportEvent (
+ hEventSource,
+ EVENTLOG_ERROR_TYPE,
+ 0,
+ SVC_ERROR,
+ NULL,
+ 2,
+ 0,
+ lpszStrings,
+ NULL
+ );
+
+ DeregisterEventSource (hEventSource);
}
}
diff --git a/RHSrvAny/RHSrvAny.h b/RHSrvAny/RHSrvAny.h
index 72ada2a..f439056 100644
--- a/RHSrvAny/RHSrvAny.h
+++ b/RHSrvAny/RHSrvAny.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4 -*- */
/* RHSrvAny - Turn any Windows program into a Windows service.
* Written by Yuval Kashtan.
* Copyright (C) 2010 Red Hat Inc.
diff --git a/RHSrvAny/resource.h b/RHSrvAny/resource.h
index ad31821..14bba9b 100644
--- a/RHSrvAny/resource.h
+++ b/RHSrvAny/resource.h
@@ -4,7 +4,7 @@
//
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
--
1.8.3.1
11 years, 4 months
[PATCH v2 0/3 supermin] URPMI & xz support.
by Richard W.M. Jones
Joseph,
Please try my modified versions of these patches. These are
compile-tested on Fedora and they don't break any existing
functionality, but I don't have either urpmi nor a statically-linked
xz so I cannot fully test them.
I have also fixed detection of zlib (2/3).
Rich.
11 years, 4 months
[PATCH] lib: avoid pragma usage in journal.c
by Olaf Hering
journal.c: In function 'guestfs__journal_get':
journal.c:120:9: error: #pragma GCC diagnostic not allowed inside functions
journal.c:121:9: error: #pragma GCC diagnostic not allowed inside functions
journal.c:123:9: error: #pragma GCC diagnostic not allowed inside functions
make[3]: *** [libguestfs_la-journal.lo] Error 1
Signed-off-by: Olaf Hering <olaf(a)aepfle.de>
---
Not compiled.
src/journal.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/journal.c b/src/journal.c
index cac8040..61ab352 100644
--- a/src/journal.c
+++ b/src/journal.c
@@ -117,10 +117,8 @@ guestfs__journal_get (guestfs_h *g)
"size=%zu, i=%zu", size, i);
goto err;
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
- len = be64toh (* (uint64_t *) &buf[i]);
-#pragma GCC diagnostic pop
+ memcpy(&len, &buf[i], sizeof(len));
+ len = be64toh (len);
i += 8;
eofield = &buf[i+len];
if (eofield > eobuf) {
11 years, 4 months
[PATCH] daemon: fix build without systemd-journal
by Olaf Hering
Fix typo in OPTGROUP_JOURNAL_NOT_AVAILABLE
Define empty journal_finalize, called by mount.c
Signed-off-by: Olaf Hering <olaf(a)aepfle.de>
---
daemon/journal.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/daemon/journal.c b/daemon/journal.c
index 0cb50e3..97e1874 100644
--- a/daemon/journal.c
+++ b/daemon/journal.c
@@ -216,6 +216,11 @@ do_journal_set_data_threshold (int64_t threshold)
#else /* !HAVE_SD_JOURNAL */
-OPTGROUP_SD_JOURNAL_NOT_AVAILABLE
+OPTGROUP_JOURNAL_NOT_AVAILABLE
+
+void
+journal_finalize (void)
+{
+}
#endif /* !HAVE_SD_JOURNAL */
11 years, 4 months
[PATCH] tests: change noinst to check
by Olaf Hering
This change avoids the hard requirement for qemu-tools during package
build.
Signed-off-by: Olaf Hering <olaf(a)aepfle.de>
---
The current OPTGROUP_SD_JOURNAL_NOT_AVAILABLE failure blocks a complete build for me,
I think the build got past the point of the failure fixed by this patch.
tests/data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 03315de..5aa3219 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -82,7 +82,7 @@ images_files_build = \
initrd-x86_64.img.gz \
test-grep.txt.gz
-noinst_DATA = $(images_files_build) test.iso
+check_DATA = $(images_files_build) test.iso
CLEANFILES = $(images_files_build) test.iso
11 years, 4 months
