196 lines
7.3 KiB
Diff
196 lines
7.3 KiB
Diff
--- and-1.2.2/Makefile.org 2005-03-27 21:39:37.000000000 +0200
|
|
+++ and-1.2.2/Makefile 2007-07-25 18:25:00.000000000 +0200
|
|
@@ -143,16 +143,16 @@ endif
|
|
# Build the auto-nice daemon.
|
|
#
|
|
and: and.o and-$(ARCH).o
|
|
- $(LD) and.o and-$(ARCH).o -o and $(LIBS)
|
|
+ $(LD) $(CFLAGS) -g and.o and-$(ARCH).o -o and $(LIBS)
|
|
|
|
|
|
#
|
|
# Independent part: configuration management, priority database.
|
|
#
|
|
and.o: and.c and.h
|
|
- $(CC) -DDEFAULT_INTERVAL=60 -DDEFAULT_NICE=0 \
|
|
- -DDEFAULT_CONFIG_FILE=\"$(INSTALL_ETC)/and.conf\" \
|
|
- -DDEFAULT_DATABASE_FILE=\"$(INSTALL_ETC)/and.priorities\" \
|
|
+ $(CC) $(CFLAGS) -g -DDEFAULT_INTERVAL=60 -DDEFAULT_NICE=0 \
|
|
+ -DDEFAULT_CONFIG_FILE=\"$(INSTALL_ETC)/and/and.conf\" \
|
|
+ -DDEFAULT_DATABASE_FILE=\"$(INSTALL_ETC)/and/and.priorities\" \
|
|
-DAND_VERSION=\"$(VERSION)\" -DAND_DATE=\"$(DATE)\" -c and.c
|
|
|
|
|
|
@@ -160,7 +160,7 @@ and.o: and.c and.h
|
|
# Unix variant specific stuff
|
|
#
|
|
and-Linux.o: and.h and-Linux.c
|
|
- $(CC) -c and-Linux.c
|
|
+ $(CC) $(CFLAGS) -g -c and-Linux.c
|
|
|
|
and-OpenBSD.o: and.h and-OpenBSD.c
|
|
$(CC) -c and-OpenBSD.c
|
|
@@ -214,30 +214,19 @@ and.priorities.5: and.priorities.5.man
|
|
#
|
|
# Install and under $(PREFIX)/bin etc.
|
|
#
|
|
-install: and $(INITSCRIPT)
|
|
- strip and
|
|
+install: and
|
|
+
|
|
#-mkdir $(PREFIX)
|
|
-mkdir -p $(DESTDIR)$(INSTALL_SBIN)
|
|
- -mkdir -p $(DESTDIR)$(INSTALL_ETC)
|
|
+ -mkdir -p $(DESTDIR)$(INSTALL_ETC)/and/
|
|
-mkdir -p $(DESTDIR)$(INSTALL_INITD)
|
|
-mkdir -p $(DESTDIR)$(INSTALL_MAN)/man5
|
|
-mkdir -p $(DESTDIR)$(INSTALL_MAN)/man8
|
|
$(INSTALL) -m 0755 and $(DESTDIR)$(INSTALL_SBIN)
|
|
- test -e $(DESTDIR)$(INSTALL_ETC)/and.conf || \
|
|
- $(INSTALL) -m 0644 and.conf $(DESTDIR)$(INSTALL_ETC)
|
|
- test -e $(DESTDIR)$(INSTALL_ETC)/and.priorities || \
|
|
- $(INSTALL) -m 0644 and.priorities $(DESTDIR)$(INSTALL_ETC)
|
|
-ifneq (${INITSCRIPT},)
|
|
-ifneq (${INSTALL_INITD},)
|
|
- @echo "Installing SysV script in $(DESTDIR)$(INSTALL_INITD)"
|
|
- $(INSTALL) -m 0755 $(INITSCRIPT) $(DESTDIR)$(INSTALL_INITD)/and
|
|
-else
|
|
- @echo "Installing SysV script in $(DESTDIR)$(INSTALL_SBIN)"
|
|
- $(INSTALL) -m 0755 $(INITSCRIPT) $(DESTDIR)$(INSTALL_SBIN)
|
|
- @echo "Installing SysV init.d finder in $(DESTDIR)$(INSTALL_SBIN)"
|
|
- $(INSTALL) -m 0755 and-find-init.d $(DESTDIR)$(INSTALL_SBIN)
|
|
-endif
|
|
-endif
|
|
+ test -e $(DESTDIR)$(INSTALL_ETC)/and/and.conf || \
|
|
+ $(INSTALL) -m 0644 and.conf $(DESTDIR)$(INSTALL_ETC)/and/
|
|
+ test -e $(DESTDIR)$(INSTALL_ETC)/and/and.priorities || \
|
|
+ $(INSTALL) -m 0644 and.priorities $(DESTDIR)$(INSTALL_ETC)/and/
|
|
$(INSTALL) -m 0644 and.8 $(DESTDIR)$(INSTALL_MAN)/man8
|
|
$(INSTALL) -m 0644 and.conf.5 $(DESTDIR)$(INSTALL_MAN)/man5
|
|
$(INSTALL) -m 0644 and.priorities.5 $(DESTDIR)$(INSTALL_MAN)/man5
|
|
@@ -252,9 +241,6 @@ simpleinstall: and and.init
|
|
cp and.conf $(DESTDIR)$(INSTALL_ETC)
|
|
test -e $(DESTDIR)$(INSTALL_ETC)/and.priorities || \
|
|
cp and.priorities $(DESTDIR)$(INSTALL_ETC)
|
|
-ifneq (${INITSCRIPT},) # on SysV only
|
|
- cp $(INITSCRIPT) $(DESTDIR)$(INSTALL_INITD)/and
|
|
-endif
|
|
cp and.8 $(DESTDIR)$(INSTALL_MAN)/man8
|
|
cp and.conf.5 $(DESTDIR)$(INSTALL_MAN)/man5
|
|
cp and.priorities.5 $(DESTDIR)$(INSTALL_MAN)/man5
|
|
--- and-1.2.2/and.priorities.5.man.org 2004-04-05 21:19:29.000000000 +0200
|
|
+++ and-1.2.2/and.priorities.5.man 2007-07-25 18:25:00.000000000 +0200
|
|
@@ -1,7 +1,7 @@
|
|
.TH AND.PRIORITIES 5 "__DATE__" "Unix" "File Formats"
|
|
|
|
.SH "NAME"
|
|
-/etc/and.priorities \- priority database for the auto nice daemon.
|
|
+/etc/and/and.priorities \- priority database for the auto nice daemon.
|
|
|
|
|
|
.SH "VERSION"
|
|
@@ -16,12 +16,12 @@ This is the priority database file for
|
|
It stores (user, group, command, parent, nicelevels) tuples (hereafter called
|
|
entries) to determine the new nice level (or the kill signal, for that
|
|
matter) when a job reaches one of the time limits defined in
|
|
-.I /etc/and.conf.
|
|
+.I /etc/and/and.conf.
|
|
(See lv1time, lv2time, and lv3time on the and.conf manual page for
|
|
details.) See the
|
|
.B affinity
|
|
setting in
|
|
-.I /etc/and.conf
|
|
+.I /etc/and/and.conf
|
|
for how ambiguities between the fields (user, group, command, parent)
|
|
are dealt with when searching the database to determine the new nice
|
|
level for a job.
|
|
@@ -187,7 +187,7 @@ grid * grid_master * 0 0 0
|
|
.SH "FILES"
|
|
|
|
.TP 0.5i
|
|
-.B /etc/and.priorities
|
|
+.B /etc/and/and.priorities
|
|
The priority database (in plain text). Contains the (user, group, command,
|
|
nicelevels) tuples. This is what this manual page is about.
|
|
|
|
--- and-1.2.2/and.conf.5.man.org 2005-03-27 21:38:32.000000000 +0200
|
|
+++ and-1.2.2/and.conf.5.man 2007-07-25 18:25:00.000000000 +0200
|
|
@@ -1,7 +1,7 @@
|
|
.TH AND.CONF 5 "__DATE__" "Unix" "File Formats"
|
|
|
|
.SH "NAME"
|
|
-/etc/and.conf \- general configuration parameters for the
|
|
+/etc/and/and.conf \- general configuration parameters for the
|
|
auto nice daemon.
|
|
|
|
|
|
@@ -52,11 +52,11 @@ the auto nice daemon to enable the chang
|
|
.B defaultnice
|
|
The default nice level. A number between 0 and 19. Jobs for which no
|
|
entry can be found in
|
|
-.I /etc/and.priorities
|
|
+.I /etc/and/and.priorities
|
|
are reniced to this level, regardless of the CPU time they've used
|
|
so far. If you prefer to renice unknown jobs gradually, you can do
|
|
so by supplying three asterisks as (user, group, command) tuple in
|
|
-.I /etc/and.priorities.
|
|
+.I /etc/and/and.priorities.
|
|
The default nice level is
|
|
.I 0
|
|
|
|
--- and-1.2.2/and.8.man.org 2002-01-27 16:59:57.000000000 +0100
|
|
+++ and-1.2.2/and.8.man 2007-07-25 18:25:00.000000000 +0200
|
|
@@ -55,13 +55,13 @@ to kill -9 it after e.g. 20 CPU minutes.
|
|
.TP 0.5i
|
|
.B \-c /path/to/and.conf
|
|
Specifies the configuration file. If this flag is omitted,
|
|
-.I /etc/and.conf
|
|
+.I /etc/and/and.conf
|
|
is used instead.
|
|
|
|
.TP 0.5i
|
|
.B \-d /path/to/and.priorities
|
|
Specifies the priority database file. If this flag is omitted,
|
|
-.I /etc/and.priorities
|
|
+.I /etc/and/and.priorities
|
|
is used instead.
|
|
|
|
.TP 0.5i
|
|
@@ -112,12 +112,12 @@ database.
|
|
.SH "FILES"
|
|
|
|
.TP 0.5i
|
|
-.B /etc/and.conf
|
|
+.B /etc/and/and.conf
|
|
General configuration file. Stores default nice level, default interval,
|
|
the "time zones" and the database lookup affinity.
|
|
|
|
.TP 0.5i
|
|
-.B /etc/and.priorities
|
|
+.B /etc/and/and.priorities
|
|
The priority database (in plain text). Contains the (user, group, command,
|
|
nicelevels) tuples.
|
|
|
|
--- and-1.2.2/README.org 2005-03-27 21:39:37.000000000 +0200
|
|
+++ and-1.2.2/README 2007-07-25 18:28:31.000000000 +0200
|
|
@@ -83,13 +83,13 @@ Installation:
|
|
|
|
Edit the Makefile, which is well documented. (g)make. (g)make install.
|
|
(make simpleinstall if you don't have install(1) (which you really
|
|
- should). Edit the configuration files, /etc/and.conf and
|
|
- /etc/and.priorities. Start /usr/local/sbin/and. You must run it as
|
|
- root if you want it to renice or kill any jobs but your own; on all
|
|
- platforms but Linux, not even dummy mode will work for mortal users.
|
|
- That's due to the way process information is accessible under these
|
|
- Unices. (Linux is more generous here, which can be seen as both an
|
|
- advantage and a security flaw. I'm not conclusive on this topic.)
|
|
+ should). Edit the configuration files, /etc/and/and.conf and
|
|
+ /etc/and/and.priorities. Start /usr/sbin/and. You must run it as root
|
|
+ if you want it to renice or kill any jobs but your own; on all platforms
|
|
+ but Linux, not even dummy mode will work for mortal users. That's due to
|
|
+ the way process information is accessible under these Unices. (Linux is
|
|
+ more generous here, which can be seen as both an advantage and a security
|
|
+ flaw. I'm not conclusive on this topic.)
|
|
|
|
Last updated:
|
|
|