From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/site/Makefile ma ...
Date: 5 Jun 2007 05:30:24 -0000 [thread overview]
Message-ID: <20070605053024.17493.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: EXPERIMENTAL
Changes by: rmccabe at sourceware.org 2007-06-05 05:30:23
Modified files:
. : conga.spec.in.in
luci/site : Makefile
make : version.in
Log message:
bz240034
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.77&r2=1.77.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.12&r2=1.12.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.31.2.1&r2=1.31.2.2
--- conga/conga.spec.in.in 2007/05/03 19:55:10 1.77
+++ conga/conga.spec.in.in 2007/06/05 05:30:22 1.77.2.1
@@ -131,45 +131,48 @@
%endif
%pre -n luci
-if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then
- /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
+if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
+ /usr/sbin/groupadd -r -f luci >&/dev/null
fi
-if ! /bin/grep ^luci\:x /etc/passwd 2>&1 >/dev/null; then
- /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
+if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
+ /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
fi
%post -n luci
/sbin/chkconfig --add luci
-/sbin/service luci status >/dev/null 2>&1
+/sbin/service luci status >&/dev/null
LUCI_RUNNING=$?
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci stop >/dev/null 2>&1
+ /sbin/service luci stop >&/dev/null
fi
-if [ -e /var/lib/luci/var/luci_backup.xml ]; then
+if [ -f /var/lib/luci/var/luci_backup.xml ]; then
# restore luci database
- /usr/sbin/luci_admin restore >/dev/null 2>&1
+ /usr/sbin/luci_admin restore >&/dev/null
fi
+
# set initial admin password (if not already set) to random value
-if ! /bin/grep True /var/lib/luci/.default_password_has_been_reset 2>&1 >/dev/null; then
- /usr/sbin/luci_admin password --random >/dev/null 2>&1
+grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null
+if [ $? -ne 0 ]; then
+ /usr/sbin/luci_admin password --random >&/dev/null &&
+ rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
fi
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci start >/dev/null 2>&1
+ /sbin/service luci start >&/dev/null
fi
%preun -n luci
if [ "$1" == "0" ]; then
- /sbin/service luci stop >/dev/null 2>&1
+ /sbin/service luci stop >&/dev/null
/sbin/chkconfig --del luci
fi
-/sbin/service luci status >/dev/null 2>&1
+/sbin/service luci status >&/dev/null
LUCI_RUNNING=$?
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci stop >/dev/null 2>&1
+ /sbin/service luci stop >&/dev/null
fi
-/usr/sbin/luci_admin backup >/dev/null 2>&1
+/usr/sbin/luci_admin backup >&/dev/null
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci start >/dev/null 2>&1
+ /sbin/service luci start >&/dev/null
fi
@@ -244,33 +247,33 @@
%{_libexecdir}/ricci-modlog
%pre -n ricci
-if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then
- /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
+if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then
+ /usr/sbin/groupadd -r -f ricci >&/dev/null
fi
-if ! /bin/grep ^ricci\:x /etc/passwd 2>&1 >/dev/null; then
- /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
+if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then
+ /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
fi
%post -n ricci
-DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
-/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
-/sbin/service oddjobd reload >/dev/null 2>&1
+DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+/sbin/service oddjobd reload >&/dev/null
/sbin/chkconfig --add ricci
%preun -n ricci
if [ "$1" == "0" ]; then
- /sbin/service ricci stop > /dev/null 2>&1
+ /sbin/service ricci stop >&/dev/null
/sbin/chkconfig --del ricci
fi
%postun -n ricci
if [ "$1" == "0" ]; then
- DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
- /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
- /sbin/service oddjobd reload > /dev/null 2>&1
+ DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+ /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+ /sbin/service oddjobd reload >&/dev/null
fi
if [ "$1" == "1" ]; then
- /sbin/service ricci condrestart > /dev/null 2>&1
+ /sbin/service ricci condrestart >&/dev/null
fi
--- conga/luci/site/Makefile 2006/12/06 22:34:09 1.12
+++ conga/luci/site/Makefile 2007/06/05 05:30:22 1.12.4.1
@@ -40,8 +40,6 @@
install:
install -d ${DESTDIR}/var/lib/luci
- echo False > ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
- chmod 640 ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
install -d ${DESTDIR}/var/lib/luci/bin
# install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin
@@ -72,13 +70,6 @@
install -d ${DESTDIR}/var/lib/luci/var
install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs
- install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs.old
- touch ${DESTDIR}/var/lib/luci/var/Data.fs.index
- chmod 600 ${DESTDIR}/var/lib/luci/var/Data.fs.index
- touch ${DESTDIR}/var/lib/luci/var/Data.fs.tmp
- chmod 600 ${DESTDIR}/var/lib/luci/var/Data.fs.tmp
- touch ${DESTDIR}/var/lib/luci/var/Data.fs.lock
- chmod 644 ${DESTDIR}/var/lib/luci/var/Data.fs.lock
install -d ${DESTDIR}/var/lib/luci/var/pts
# install -m 644 `find luci/var/pts -maxdepth 1 -type f | grep .mo | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/var/pts
install -d ${DESTDIR}/var/lib/luci/var/certs
@@ -95,4 +86,3 @@
distclean: clean
-
--- conga/make/version.in 2007/05/03 20:01:08 1.31.2.1
+++ conga/make/version.in 2007/06/05 05:30:23 1.31.2.2
@@ -1,5 +1,5 @@
VERSION=0.10.0
-RELEASE=0_UNRELEASED
+RELEASE=1_UNRELEASED
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
next reply other threads:[~2007-06-05 5:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-05 5:30 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-08-11 4:16 [Cluster-devel] conga ./conga.spec.in.in luci/site/Makefile ma rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070605053024.17493.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.