Move ostree-* executables to /usr/lib/ostree

Why not to use libexecdir?

Because this directory does not exist on some distros or paths
between distros varies. There are several reasons why a well
known path is prefered, for example when generating a kernel
command line:

init=${ostree}/usr/lib/ostree-boot/ostree-prepare-root

In addition this saves us some typing in a console when wanting
to access the "ostree" cmd line.

Closes: #449
Approved by: cgwalters

8 files changed, 14 insertions, 10 deletions

diff --git a/Makefile-boot.am b/Makefile-boot.am
index 508f59bc..8d7ade07 100644
--- a/Makefile-boot.am
+++ b/Makefile-boot.am
@@ -53,7 +53,7 @@ grub2configdir = $(sysconfdir)/grub.d
 INSTALL_DATA_HOOKS += install-grub2-config-hook
 else
 # We're using our internal generator
-libexec_SCRIPTS = src/boot/grub2/ostree-grub-generator
+ostree_boot_SCRIPTS = src/boot/grub2/ostree-grub-generator
 endif
 
 EXTRA_DIST += src/boot/dracut/module-setup.sh \
diff --git a/Makefile-decls.am b/Makefile-decls.am
index f7ebd422..d7e61355 100644
--- a/Makefile-decls.am
+++ b/Makefile-decls.am
@@ -43,6 +43,8 @@ gir_DATA =
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA =
 gsettings_SCHEMAS =
+ostree_bootdir = /usr/lib/ostree
+ostree_boot_PROGRAMS =
 
 # This is a special facility to chain together hooks easily
 INSTALL_DATA_HOOKS =
diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am
index ef837ced..f79553eb 100644
--- a/Makefile-switchroot.am
+++ b/Makefile-switchroot.am
@@ -16,8 +16,10 @@
 # Boston, MA 02111-1307, USA.
 
 if BUILDOPT_SYSTEMD
-sbin_PROGRAMS += ostree-prepare-root
-sbin_PROGRAMS += ostree-remount
+
+ostree_boot_PROGRAMS += ostree-prepare-root
+ostree_boot_PROGRAMS += ostree-remount
+
 noinst_LTLIBRARIES += libswitchroot-mountutil.la
 endif
 
diff --git a/src/boot/dracut/module-setup.sh b/src/boot/dracut/module-setup.sh
index d8ee05ba..20c828dc 100755
--- a/src/boot/dracut/module-setup.sh
+++ b/src/boot/dracut/module-setup.sh
@@ -20,7 +20,7 @@
 # Boston, MA 02111-1307, USA.
 
 check() {
-    if [[ -x $systemdutildir/systemd ]] && [[ -x /usr/sbin/ostree-prepare-root ]]; then
+    if [[ -x $systemdutildir/systemd ]] && [[ -x /usr/lib/ostree/ostree-prepare-root ]]; then
        return 255
     fi
 
@@ -32,7 +32,7 @@ depends() {
 }
 
 install() {
-    dracut_install ostree-prepare-root
+    dracut_install /usr/lib/ostree/ostree-prepare-root
     inst_simple "${systemdsystemunitdir}/ostree-prepare-root.service"
     mkdir -p "${initdir}${systemdsystemconfdir}/initrd-switch-root.target.wants"
     ln_r "${systemdsystemunitdir}/ostree-prepare-root.service" \
diff --git a/src/boot/mkinitcpio/ostree b/src/boot/mkinitcpio/ostree
index 46748370..7f21cacd 100644
--- a/src/boot/mkinitcpio/ostree
+++ b/src/boot/mkinitcpio/ostree
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 build() {
-    add_binary /usr/sbin/ostree-prepare-root
-    add_binary /usr/sbin/ostree-remount
+    add_binary /usr/lib/ostree/ostree-prepare-root
+    add_binary /usr/lib/ostree/ostree-remount
 
     add_file /usr/lib/systemd/system/ostree-prepare-root.service
     add_symlink /usr/lib/systemd/system/initrd-switch-root.target.wants/ostree-prepare-root.service \
diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service
index dbc7b30a..e0659d10 100644
--- a/src/boot/ostree-prepare-root.service
+++ b/src/boot/ostree-prepare-root.service
@@ -27,7 +27,7 @@ Before=plymouth-switch-root.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/ostree-prepare-root /sysroot
+ExecStart=/usr/lib/ostree/ostree-prepare-root /sysroot
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog+console
diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service
index 196649b7..61dd5fa8 100644
--- a/src/boot/ostree-remount.service
+++ b/src/boot/ostree-remount.service
@@ -31,7 +31,7 @@ Before=systemd-tmpfiles-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/ostree-remount
+ExecStart=/usr/lib/ostree/ostree-remount
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog+console
diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
index b2c68ac9..f3dc8e16 100644
--- a/src/libostree/ostree-bootloader-grub2.c
+++ b/src/libostree/ostree-bootloader-grub2.c
@@ -315,7 +315,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
         use_system_grub2_mkconfig = FALSE;
     }
   else
-    grub_exec = use_system_grub2_mkconfig ? GRUB2_MKCONFIG_PATH : LIBEXECDIR "/ostree-grub-generator";
+    grub_exec = use_system_grub2_mkconfig ? GRUB2_MKCONFIG_PATH : "/usr/lib/ostree/ostree-grub-generator";
 
   if (use_system_grub2_mkconfig && ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
       && g_file_has_parent (self->sysroot->path, NULL))