xsplash

Merge lp://qastaging/~ken-vandine/xsplash/with-user into lp://qastaging/xsplash

  1. with-user
  2. Merge into trunk
Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp://qastaging/~ken-vandine/xsplash/with-user
Merge into: lp://qastaging/xsplash
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~ken-vandine/xsplash/with-user
Reviewer Review Type Date Requested Status
Cody Russell Pending
Review via email: mp+10469@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2009-08-20.

Commit message

  * Added a configure argument to select which user to run as, default to root.
  * If --with-user is set, install the xsplash binary setuid as that user.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

  * Added a configure argument to select which user to run as, default to root.
  * If --with-user is set, install the xsplash binary setuid as that user.

data/xsplash.conf still needs to do the substitution for RUN_AS_USER

lp://qastaging/~ken-vandine/xsplash/with-user updated
48. By Cody Russell

default frames to 50

49. By Cody Russell

merge with-user branch

50. By Ken VanDine

Fixed a copy and paste bug that was breaking installs

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-08-12 16:23:30 +0000
3+++ configure.ac 2009-08-20 16:52:05 +0000
4@@ -75,6 +75,16 @@
5 fi
6 AC_SUBST(DBUS_SYS_DIR)
7
8+dnl ===========================================================================
9+
10+AC_ARG_WITH(user,
11+ AS_HELP_STRING([--with-user=<user>],
12+ [which user to run xsplash as]))
13+
14+if ! test -z "$with_user" ; then
15+ RUN_AS_USER="$with_user"
16+fi
17+AC_SUBST(RUN_AS_USER)
18
19 dnl ===========================================================================
20
21@@ -99,4 +109,7 @@
22 echo ""
23 echo " Prefix : ${prefix}"
24 echo " dbus sysdir : ${DBUS_SYS_DIR}"
25+if test $RUN_AS_USER; then
26+echo " Run as user : ${RUN_AS_USER}"
27+fi
28 echo ""
29
30=== modified file 'src/Makefile.am'
31--- src/Makefile.am 2009-08-20 09:38:11 +0000
32+++ src/Makefile.am 2009-08-20 16:52:05 +0000
33@@ -71,3 +71,22 @@
34 gtytypebuiltins.h \
35 dbus-xsplash-server.h \
36 stamp-gtytypebuiltins.h
37+
38+install-binPROGRAMS: $(bin_PROGRAMS)
39+ @$(NORMAL_INSTALL)
40+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
41+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
42+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
43+ if test -f $$p \
44+ || test -f $$p1 \
45+ ; then \
46+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
47+ if test $(RUN_AS_USER) ; then \
48+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) -o $(RUN_AS_USER) -m 4700 '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
49+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) -o $(RUN_AS_USER) -m 4700 "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
50+ else : \
51+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
52+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
53+ fi; \
54+ else :; fi; \
55+ done

Subscribers

People subscribed via source and target branches

to all changes: