Skip to content

Commit

Permalink
Merge branch 'jb42668' into 'master'
Browse files Browse the repository at this point in the history
Mount sd-card earlier

See merge request mer-core/udisks2!9
  • Loading branch information
Matti Kosola committed Aug 14, 2018
2 parents 3433c2e + 0bd88b0 commit 5071732
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -46,7 +46,7 @@ index 00000000..a981e303
@@ -0,0 +1,12 @@
+[Unit]
+Description=Handle udisks sd mount
+After=init-done.service dev-%i.device
+After=dev-%i.device
+BindsTo=dev-%i.device
+Conflicts=rescue.target actdead.target factory-test.target
+
Expand Down
2 changes: 1 addition & 1 deletion rpm/udisks2.spec
Expand Up @@ -113,13 +113,13 @@ dynamic library, which provides access to the udisksd daemon.
%patch8 -p1 -b .format-another-seat
%patch9 -p1 -b .unlock-another-seat

%build
# Disable gtk-doc
sed -i 's/SUBDIRS = data udisks src tools modules po doc/SUBDIRS = data udisks src tools modules po/' Makefile.am
sed -i '/--enable-gtk-doc/d' Makefile.am
sed -i '/doc\/Makefile/d' configure.ac
sed -i '/GTK_DOC_CHECK/d' configure.ac

%build
glib-gettextize --force --copy
intltoolize --force --copy --automake
autoreconf -vfi -Wno-portability
Expand Down

0 comments on commit 5071732

Please sign in to comment.