First step of renaming the Boot Manager to Node Startup Controller

This includes mostly files, directories and the package/tarball name.
The classes and D-Bus interfaces will be renamed in the next step.

diff --git a/Makefile.am b/Makefile.am
index 0183a76..bccc2ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 
 SUBDIRS =                                                              \
        common                                                          \
-       boot-manager                                                    \
        legacy-app-handler                                              \
+       node-startup-controller                                         \
        nsm-dummy                                                       \
        docs                                                            \
        tests

diff --git a/configure.ac b/configure.ac
index e037621..2d6a087 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,17 @@
 dnl ***************************
 dnl *** Version information ***
 dnl ***************************
-m4_define([boot_manager_version_api_major], [1])
-m4_define([boot_manager_version_major], [0])
-m4_define([boot_manager_version_minor], [1])
-m4_define([boot_manager_version_micro], [0])
-m4_define([boot_manager_version], [boot_manager_version_major().boot_manager_version_minor().boot_manager_version_micro()])
+m4_define([node_startup_controller_version_api_major], [1])
+m4_define([node_startup_controller_version_major], [0])
+m4_define([node_startup_controller_version_minor], [1])
+m4_define([node_startup_controller_version_micro], [0])
+m4_define([node_startup_controller_version], [node_startup_controller_version_major().node_startup_controller_version_minor().node_startup_controller_version_micro()])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2012 GENIVI <genivi-dev@mail.genivi.org>])
-AC_INIT([boot-manager], [boot_manager_version], [genivi-dev@mail.genivi.org])
+AC_INIT([node-startup-controller], [node_startup_controller_version], [genivi-dev@mail.genivi.org])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 
@@ -26,18 +26,18 @@ AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl **********************************
-dnl *** Subst boot-manager version ***
+dnl *** Subst node-startup-controller version ***
 dnl **********************************
-BOOT_MANAGER_VERSION_MAJOR=boot_manager_version_major()
-BOOT_MANAGER_VERSION_MINOR=boot_manager_version_minor()
-BOOT_MANAGER_VERSION_MICRO=boot_manager_version_micro()
-BOOT_MANAGER_VERSION_API_MAJOR=boot_manager_version_api_major()
-BOOT_MANAGER_VERSION_API=$BOOT_MANAGER_VERSION_API_MAJOR
-AC_SUBST([BOOT_MANAGER_VERSION_MAJOR])
-AC_SUBST([BOOT_MANAGER_VERSION_MINOR])
-AC_SUBST([BOOT_MANAGER_VERSION_MICRO])
-AC_SUBST([BOOT_MANAGER_VERSION_API_MAJOR])
-AC_SUBST([BOOT_MANAGER_VERSION_API])
+NODE_STARTUP_CONTROLLER_VERSION_MAJOR=node_startup_controller_version_major()
+NODE_STARTUP_CONTROLLER_VERSION_MINOR=node_startup_controller_version_minor()
+NODE_STARTUP_CONTROLLER_VERSION_MICRO=node_startup_controller_version_micro()
+NODE_STARTUP_CONTROLLER_VERSION_API_MAJOR=node_startup_controller_version_api_major()
+NODE_STARTUP_CONTROLLER_VERSION_API=$NODE_STARTUP_CONTROLLER_VERSION_API_MAJOR
+AC_SUBST([NODE_STARTUP_CONTROLLER_VERSION_MAJOR])
+AC_SUBST([NODE_STARTUP_CONTROLLER_VERSION_MINOR])
+AC_SUBST([NODE_STARTUP_CONTROLLER_VERSION_MICRO])
+AC_SUBST([NODE_STARTUP_CONTROLLER_VERSION_API_MAJOR])
+AC_SUBST([NODE_STARTUP_CONTROLLER_VERSION_API])
 
 dnl ********************************
 dnl *** Check for basic programs ***
@@ -135,8 +135,8 @@ AC_DEFINE_UNQUOTED([PRIORITISED_LUC_TYPES],
 
 AC_OUTPUT([
 Makefile
-boot-manager/busconf/Makefile
-boot-manager/Makefile
+node-startup-controller/busconf/Makefile
+node-startup-controller/Makefile
 common/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -146,6 +146,6 @@ legacy-app-handler/Makefile
 nsm-dummy/busconf/Makefile
 nsm-dummy/Makefile
 tests/Makefile
-tests/boot-manager/Makefile
+tests/node-startup-controller/Makefile
 tests/legacy-app-handler/Makefile
 ])

diff --git a/docs/reference/node-startup-controller/Makefile.am b/docs/reference/node-startup-controller/Makefile.am
index 0f17971..3d7a646 100644 (file)
--- a/docs/reference/node-startup-controller/Makefile.am
+++ b/docs/reference/node-startup-controller/Makefile.am
@@ -17,7 +17,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # for inline comments documenting functions and macros.
 # e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
 DOC_SOURCE_DIR =                                                       \
-       $(top_srcdir)/boot-manager                                      \
+       $(top_srcdir)/node-startup-controller                                   \
        $(top_srcdir)/common                                            \
        $(top_srcdir)/legacy-app-handler
 
@@ -47,10 +47,10 @@ FIXXREF_OPTIONS=
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB =                                                           \
-       $(top_srcdir)/boot-manager/*.h                                  \
+       $(top_srcdir)/node-startup-controller/*.h                                       \
        $(top_srcdir)/common/*.h
 CFILE_GLOB =                                                           \
-       $(top_srcdir)/boot-manager/*.c                                  \
+       $(top_srcdir)/node-startup-controller/*.c                                       \
        $(top_srcdir)/common/*.c                                        \
        $(top_srcdir)/legacy-app-handler/*.c
 

diff --git a/docs/reference/node-startup-controller/node-startup-controller-docs.xml b/docs/reference/node-startup-controller/node-startup-controller-docs.xml
index 4830870..996a15e 100644 (file)
--- a/docs/reference/node-startup-controller/node-startup-controller-docs.xml
+++ b/docs/reference/node-startup-controller/node-startup-controller-docs.xml
@@ -88,7 +88,7 @@
 
   <chapter>
     <title>Public API</title>
-    <xi:include href="../../../boot-manager/boot-manager-dbus-doc-org.genivi.BootManager1.BootManager.xml"/>
+    <xi:include href="../../../node-startup-controller/boot-manager-dbus-doc-org.genivi.BootManager1.BootManager.xml"/>
     <xi:include href="legacy-app-handler.xml"/>
   </chapter>
 

diff --git a/boot-manager/Makefile.am b/node-startup-controller/Makefile.am
similarity index 100%
rename from boot-manager/Makefile.am
rename to node-startup-controller/Makefile.am

diff --git a/boot-manager/boot-manager-application.c b/node-startup-controller/boot-manager-application.c
similarity index 98%
rename from boot-manager/boot-manager-application.c
rename to node-startup-controller/boot-manager-application.c
index 60b6ceb..5fb7436 100644 (file)
--- a/boot-manager/boot-manager-application.c
+++ b/node-startup-controller/boot-manager-application.c
@@ -25,11 +25,11 @@
 #include <common/shutdown-consumer-dbus.h>
 #include <common/watchdog-client.h>
 
-#include <boot-manager/boot-manager-application.h>
-#include <boot-manager/boot-manager-service.h>
-#include <boot-manager/job-manager.h>
-#include <boot-manager/la-handler-service.h>
-#include <boot-manager/luc-starter.h>
+#include <node-startup-controller/boot-manager-application.h>
+#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/job-manager.h>
+#include <node-startup-controller/la-handler-service.h>
+#include <node-startup-controller/luc-starter.h>
 
 
 

diff --git a/boot-manager/boot-manager-application.h b/node-startup-controller/boot-manager-application.h
similarity index 92%
rename from boot-manager/boot-manager-application.h
rename to node-startup-controller/boot-manager-application.h
index 34cac86..e7e5214 100644 (file)
--- a/boot-manager/boot-manager-application.h
+++ b/node-startup-controller/boot-manager-application.h
@@ -12,9 +12,9 @@
 
 #include <gio/gio.h>
 
-#include <boot-manager/boot-manager-service.h>
-#include <boot-manager/job-manager.h>
-#include <boot-manager/la-handler-service.h>
+#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/job-manager.h>
+#include <node-startup-controller/la-handler-service.h>
 
 G_BEGIN_DECLS
 

diff --git a/boot-manager/boot-manager-dbus.xml b/node-startup-controller/boot-manager-dbus.xml
similarity index 100%
rename from boot-manager/boot-manager-dbus.xml
rename to node-startup-controller/boot-manager-dbus.xml

diff --git a/boot-manager/boot-manager-service.c b/node-startup-controller/boot-manager-service.c
similarity index 99%
rename from boot-manager/boot-manager-service.c
rename to node-startup-controller/boot-manager-service.c
index 9f48c67..c775d44 100644 (file)
--- a/boot-manager/boot-manager-service.c
+++ b/node-startup-controller/boot-manager-service.c
@@ -17,9 +17,9 @@
 
 #include <dlt/dlt.h>
 
-#include <boot-manager/glib-extensions.h>
-#include <boot-manager/boot-manager-dbus.h>
-#include <boot-manager/boot-manager-service.h>
+#include <node-startup-controller/glib-extensions.h>
+#include <node-startup-controller/boot-manager-dbus.h>
+#include <node-startup-controller/boot-manager-service.h>
 
 
 

diff --git a/boot-manager/boot-manager-service.h b/node-startup-controller/boot-manager-service.h
similarity index 97%
rename from boot-manager/boot-manager-service.h
rename to node-startup-controller/boot-manager-service.h
index 41a4821..7b4231c 100644 (file)
--- a/boot-manager/boot-manager-service.h
+++ b/node-startup-controller/boot-manager-service.h
@@ -12,7 +12,7 @@
 
 #include <gio/gio.h>
 
-#include <boot-manager/systemd-manager-dbus.h>
+#include <node-startup-controller/systemd-manager-dbus.h>
 
 G_BEGIN_DECLS
 

diff --git a/boot-manager/boot-manager.service.in b/node-startup-controller/boot-manager.service.in
similarity index 100%
rename from boot-manager/boot-manager.service.in
rename to node-startup-controller/boot-manager.service.in

diff --git a/boot-manager/busconf/Makefile.am b/node-startup-controller/busconf/Makefile.am
similarity index 100%
rename from boot-manager/busconf/Makefile.am
rename to node-startup-controller/busconf/Makefile.am

diff --git a/boot-manager/busconf/org.genivi.BootManager1.conf b/node-startup-controller/busconf/org.genivi.BootManager1.conf
similarity index 100%
rename from boot-manager/busconf/org.genivi.BootManager1.conf
rename to node-startup-controller/busconf/org.genivi.BootManager1.conf

diff --git a/boot-manager/glib-extensions.c b/node-startup-controller/glib-extensions.c
similarity index 97%
rename from boot-manager/glib-extensions.c
rename to node-startup-controller/glib-extensions.c
index b1cdae1..d3f161f 100644 (file)
--- a/boot-manager/glib-extensions.c
+++ b/node-startup-controller/glib-extensions.c
@@ -13,7 +13,7 @@
 
 #include <glib.h>
 
-#include <boot-manager/glib-extensions.h>
+#include <node-startup-controller/glib-extensions.h>
 
 
 

diff --git a/boot-manager/glib-extensions.h b/node-startup-controller/glib-extensions.h
similarity index 100%
rename from boot-manager/glib-extensions.h
rename to node-startup-controller/glib-extensions.h

diff --git a/boot-manager/job-manager.c b/node-startup-controller/job-manager.c
similarity index 99%
rename from boot-manager/job-manager.c
rename to node-startup-controller/job-manager.c
index f66247a..a3f7318 100644 (file)
--- a/boot-manager/job-manager.c
+++ b/node-startup-controller/job-manager.c
@@ -14,8 +14,8 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <boot-manager/job-manager.h>
-#include <boot-manager/systemd-manager-dbus.h>
+#include <node-startup-controller/job-manager.h>
+#include <node-startup-controller/systemd-manager-dbus.h>
 
 
 

diff --git a/boot-manager/job-manager.h b/node-startup-controller/job-manager.h
similarity index 97%
rename from boot-manager/job-manager.h
rename to node-startup-controller/job-manager.h
index d20c7ba..9eed6b2 100644 (file)
--- a/boot-manager/job-manager.h
+++ b/node-startup-controller/job-manager.h
@@ -10,7 +10,7 @@
 #ifndef __JOB_MANAGER_H__
 #define __JOB_MANAGER_H__
 
-#include <boot-manager/systemd-manager-dbus.h>
+#include <node-startup-controller/systemd-manager-dbus.h>
 
 G_BEGIN_DECLS
 

diff --git a/boot-manager/la-handler-service.c b/node-startup-controller/la-handler-service.c
similarity index 99%
rename from boot-manager/la-handler-service.c
rename to node-startup-controller/la-handler-service.c
index 01ea17b..edcd219 100644 (file)
--- a/boot-manager/la-handler-service.c
+++ b/node-startup-controller/la-handler-service.c
@@ -22,8 +22,8 @@
 #include <common/shutdown-client.h>
 #include <common/shutdown-consumer-dbus.h>
 
-#include <boot-manager/job-manager.h>
-#include <boot-manager/la-handler-service.h>
+#include <node-startup-controller/job-manager.h>
+#include <node-startup-controller/la-handler-service.h>
 
 
 

diff --git a/boot-manager/la-handler-service.h b/node-startup-controller/la-handler-service.h
similarity index 98%
rename from boot-manager/la-handler-service.h
rename to node-startup-controller/la-handler-service.h
index 0d9f69d..831fcca 100644 (file)
--- a/boot-manager/la-handler-service.h
+++ b/node-startup-controller/la-handler-service.h
@@ -14,7 +14,7 @@
 
 #include <common/nsm-consumer-dbus.h>
 
-#include <boot-manager/job-manager.h>
+#include <node-startup-controller/job-manager.h>
 
 G_BEGIN_DECLS
 

diff --git a/boot-manager/luc-starter.c b/node-startup-controller/luc-starter.c
similarity index 99%
rename from boot-manager/luc-starter.c
rename to node-startup-controller/luc-starter.c
index 48e04b4..071f174 100644 (file)
--- a/boot-manager/luc-starter.c
+++ b/node-startup-controller/luc-starter.c
@@ -22,9 +22,9 @@
 
 #include <common/nsm-lifecycle-control-dbus.h>
 
-#include <boot-manager/boot-manager-service.h>
-#include <boot-manager/job-manager.h>
-#include <boot-manager/luc-starter.h>
+#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/job-manager.h>
+#include <node-startup-controller/luc-starter.h>
 
 
 

diff --git a/boot-manager/luc-starter.h b/node-startup-controller/luc-starter.h
similarity index 93%
rename from boot-manager/luc-starter.h
rename to node-startup-controller/luc-starter.h
index b74bf43..bcb145e 100644 (file)
--- a/boot-manager/luc-starter.h
+++ b/node-startup-controller/luc-starter.h
@@ -10,10 +10,8 @@
 #ifndef __LUC_STARTER_H__
 #define __LUC_STARTER_H__
 
-#include <boot-manager/boot-manager-service.h>
-#include <boot-manager/job-manager.h>
-
-
+#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/job-manager.h>
 
 G_BEGIN_DECLS
 

diff --git a/boot-manager/main.c b/node-startup-controller/main.c
similarity index 94%
rename from boot-manager/main.c
rename to node-startup-controller/main.c
index 1fe4766..348597b 100644 (file)
--- a/boot-manager/main.c
+++ b/node-startup-controller/main.c
@@ -20,12 +20,12 @@
 
 #include <dlt/dlt.h>
 
-#include <boot-manager/boot-manager-application.h>
-#include <boot-manager/boot-manager-dbus.h>
-#include <boot-manager/boot-manager-service.h>
-#include <boot-manager/la-handler-service.h>
-#include <boot-manager/systemd-manager-dbus.h>
-#include <boot-manager/target-startup-monitor.h>
+#include <node-startup-controller/boot-manager-application.h>
+#include <node-startup-controller/boot-manager-dbus.h>
+#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/la-handler-service.h>
+#include <node-startup-controller/systemd-manager-dbus.h>
+#include <node-startup-controller/target-startup-monitor.h>
 
 
 

diff --git a/boot-manager/org.genivi.BootManager1.service.in b/node-startup-controller/org.genivi.BootManager1.service.in
similarity index 100%
rename from boot-manager/org.genivi.BootManager1.service.in
rename to node-startup-controller/org.genivi.BootManager1.service.in

diff --git a/boot-manager/systemd-manager-dbus.xml b/node-startup-controller/systemd-manager-dbus.xml
similarity index 100%
rename from boot-manager/systemd-manager-dbus.xml
rename to node-startup-controller/systemd-manager-dbus.xml

diff --git a/boot-manager/systemd-unit-dbus.xml b/node-startup-controller/systemd-unit-dbus.xml
similarity index 100%
rename from boot-manager/systemd-unit-dbus.xml
rename to node-startup-controller/systemd-unit-dbus.xml

diff --git a/boot-manager/target-startup-monitor.c b/node-startup-controller/target-startup-monitor.c
similarity index 98%
rename from boot-manager/target-startup-monitor.c
rename to node-startup-controller/target-startup-monitor.c
index f448b14..722ab56 100644 (file)
--- a/boot-manager/target-startup-monitor.c
+++ b/node-startup-controller/target-startup-monitor.c
@@ -19,9 +19,9 @@
 #include <common/nsm-enum-types.h>
 #include <common/nsm-lifecycle-control-dbus.h>
 
-#include <boot-manager/boot-manager-dbus.h>
-#include <boot-manager/target-startup-monitor.h>
-#include <boot-manager/systemd-unit-dbus.h>
+#include <node-startup-controller/boot-manager-dbus.h>
+#include <node-startup-controller/target-startup-monitor.h>
+#include <node-startup-controller/systemd-unit-dbus.h>
 
 
 
@@ -324,7 +324,7 @@ target_startup_monitor_get_unit_finish (GObject      *object,
 
       /* create a proxy for this unit D-Bus object */
       systemd_unit_proxy_new (g_dbus_proxy_get_connection (G_DBUS_PROXY (data->monitor->systemd_manager)),
-                              G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+                              G_DBUS_PROXY_FLAGS_NONE,
                               "org.freedesktop.systemd1",
                               object_path,
                               NULL,

diff --git a/boot-manager/target-startup-monitor.h b/node-startup-controller/target-startup-monitor.h
similarity index 96%
rename from boot-manager/target-startup-monitor.h
rename to node-startup-controller/target-startup-monitor.h
index b4054e8..b16eb21 100644 (file)
--- a/boot-manager/target-startup-monitor.h
+++ b/node-startup-controller/target-startup-monitor.h
@@ -10,7 +10,7 @@
 #ifndef __TARGET_STARTUP_MONITOR_H__
 #define __TARGET_STARTUP_MONITOR_H__
 
-#include <boot-manager/systemd-manager-dbus.h>
+#include <node-startup-controller/systemd-manager-dbus.h>
 
 G_BEGIN_DECLS
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0e58ad8..1b74e60 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 
 SUBDIRS =                                                              \
-       boot-manager                                                    \
-       legacy-app-handler
+       legacy-app-handler                                              \
+       node-startup-controller

diff --git a/tests/boot-manager/Makefile.am b/tests/node-startup-controller/Makefile.am
similarity index 100%
rename from tests/boot-manager/Makefile.am
rename to tests/node-startup-controller/Makefile.am

diff --git a/tests/boot-manager/gvariant-writer.c b/tests/node-startup-controller/gvariant-writer.c
similarity index 100%
rename from tests/boot-manager/gvariant-writer.c
rename to tests/node-startup-controller/gvariant-writer.c

diff --git a/tests/boot-manager/test-luc-handler b/tests/node-startup-controller/test-luc-handler
similarity index 100%
rename from tests/boot-manager/test-luc-handler
rename to tests/node-startup-controller/test-luc-handler