Use libsqlfs_mount to mount the sqlfs

A systemd .mount file will not work with busybox mount, so we must
resort to using libsqlfs_mount instead.

4 files changed, 49 insertions, 5 deletions

diff --git a/packaging/libsqlfs.changes b/packaging/libsqlfs.changes
new file mode 100644
index 0000000..4610d8d
--- /dev/null
+++ b/packaging/libsqlfs.changes
@@ -0,0 +1,20 @@
+* Mon Jul 02 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> da30650
+- Use libsqlfs_mount to mount the sqlfs
+
+* Thu Jun 21 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> c6b2201
+- Add/install systemd service files
+
+* Tue May 29 2012 Ryan Ware <ryan.r.ware@intel.com> d0eff4f
+- Add default Smack manifest for libsqlfs.spec
+
+* Sun Apr 29 2012 Kim Kibum <kb0929.kim@samsung.com> 9a5896b
+- upload tizen1.0 source
+
+* Tue Mar 13 2012 Yan Yin <yan.yin@intel.com> 699dcb3
+- update for beta universally
+
+* Fri Jan 06 2012 Kibum Kim <kb0929.kim@samsung.com> 17cd8ae
+- Git init
+[ Eunkyoung Kim ]
+- Initial empty repository
+
diff --git a/packaging/libsqlfs.spec b/packaging/libsqlfs.spec
index b13aba7..372bcc1 100644
--- a/packaging/libsqlfs.spec
+++ b/packaging/libsqlfs.spec
@@ -9,6 +9,7 @@ Source1:    opt-var-kdb-db.mount
 Source2:    opt-var-kdb-db-setup.service
 Source3:    sqlfs-setup
 Source4:    mount.fuse.libsqlfs
+Source5:    opt-var-kdb-db-libsqlfs.service
 Source1001: packaging/libsqlfs.manifest 
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(fuse)
@@ -28,7 +29,7 @@ FUSE module for filesystem on top of an SQLite database
 %build
 cp %{SOURCE1001} .
 
-gcc  $(CFLAGS) \
+gcc $CFLAGS \
                 -DFUSE \
                 -D_GNU_SOURCE \
                 -D_FILE_OFFSET_BITS=64 \
@@ -43,7 +44,7 @@ gcc  $(CFLAGS) \
                 -lfuse -lrt\
                 -lsqlite3 -ldl -lcap
 
-gcc $(CFLAGS) \
+gcc $CFLAGS \
                 sqlfs_txn_cmd.c \
                 -o sqlfs_txn_cmd \
                 $(LDFLAGS)
@@ -60,8 +61,9 @@ install -m 0755 %{SOURCE4} %{buildroot}/sbin/
 mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
 install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
 install -m 0644 %{SOURCE2} %{buildroot}%{_libdir}/systemd/system/
-ln -sf ../opt-var-kdb-db.mount %{buildroot}%{_libdir}/systemd/system/basic.target.wants/
+install -m 0644 %{SOURCE5} %{buildroot}%{_libdir}/systemd/system/
 ln -sf ../opt-var-kdb-db-setup.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/
+ln -sf ../opt-var-kdb-db-libsqlfs.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/
 
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
@@ -88,6 +90,7 @@ systemctl daemon-reload
 %{_bindir}/libsqlfs_mount
 %{_bindir}/sqlfs-setup
 %{_libdir}/systemd/system/opt-var-kdb-db.mount
+%{_libdir}/systemd/system/opt-var-kdb-db-libsqlfs.service
 %{_libdir}/systemd/system/opt-var-kdb-db-setup.service
-%{_libdir}/systemd/system/basic.target.wants/opt-var-kdb-db.mount
+%{_libdir}/systemd/system/basic.target.wants/opt-var-kdb-db-libsqlfs.service
 %{_libdir}/systemd/system/basic.target.wants/opt-var-kdb-db-setup.service
diff --git a/packaging/opt-var-kdb-db-libsqlfs.service b/packaging/opt-var-kdb-db-libsqlfs.service
new file mode 100644
index 0000000..d4b8938
--- /dev/null
+++ b/packaging/opt-var-kdb-db-libsqlfs.service
@@ -0,0 +1,20 @@
+
+[Unit]
+Description=SQLfs mount for vconf
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/opt/var/kdb/db
+ConditionPathIsSymbolicLink=!/opt/var/kdb/db
+DefaultDependencies=no
+After=opt-var-kdb-db-setup.service
+After=local-fs.target
+Before=basic.target
+
+[Service]
+Type=oneshot
+# bpeters - Busybox mount does not support mounting sqlfs, using libsqlfs_mount instead
+ExecStart=/usr/bin/libsqlfs_mount -s -o nonempty -o default_permissions -o allow_other /opt/var/kdb/db
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
+
diff --git a/packaging/opt-var-kdb-db-setup.service b/packaging/opt-var-kdb-db-setup.service
index efbcb61..726a9d5 100644
--- a/packaging/opt-var-kdb-db-setup.service
+++ b/packaging/opt-var-kdb-db-setup.service
@@ -4,7 +4,8 @@ Description=Initialize the SQLfs storage folders for firstboot
 ConditionPathExists=/opt/var/kdb/kdb_first_boot
 DefaultDependencies=no
 After=local-fs.target
-Before=opt-var-kdb-db.mount
+Before=opt-var-kdb-db-libsqlfs.service
+#Before=opt-var-kdb-db.mount
 
 [Service]
 Type=oneshot