]>
Commit | Line | Data |
---|---|---|
612af2b6 JB |
1 | --- sysvinit-2.86/src/Makefile.orig 2004-06-09 14:47:45.000000000 +0200 |
2 | +++ sysvinit-2.86/src/Makefile 2004-12-26 22:40:47.622737944 +0100 | |
3 | @@ -9,7 +9,8 @@ | |
cbb242b0 | 4 | # |
5 | ||
612af2b6 JB |
6 | CC = gcc |
7 | -CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE | |
8 | +OPTIMIZE = -O2 -fomit-frame-pointer | |
cbb242b0 | 9 | +CFLAGS = -Wall $(OPTIMIZE) -D_GNU_SOURCE |
10 | LDFLAGS = -s | |
da5a9b6e AM |
11 | STATIC = |
12 | ||
612af2b6 JB |
13 | @@ -26,7 +27,7 @@ |
14 | ifeq ($(DISTRO),) | |
15 | BIN += mountpoint | |
16 | SBIN += sulogin bootlogd | |
17 | -USRBIN += utmpdump wall | |
18 | +USRBIN += utmpx-dump wall | |
19 | MAN1 += mountpoint.1 wall.1 | |
20 | MAN8 += sulogin.8 bootlogd.8 | |
cbb242b0 | 21 | endif |
612af2b6 JB |
22 | @@ -71,7 +72,7 @@ |
23 | mountpoint: mountpoint.o | |
24 | $(CC) $(LDFLAGS) -o $@ mountpoint.o | |
25 | ||
26 | -utmpdump: utmpdump.o | |
27 | +utmpx-dump: utmpdump.o | |
28 | $(CC) $(LDFLAGS) -o $@ utmpdump.o | |
29 | ||
30 | runlevel: runlevel.o | |
31 | --- sysvinit-2.86/src/paths.h.orig 2004-06-09 14:47:45.000000000 +0200 | |
32 | +++ sysvinit-2.86/src/paths.h 2004-12-26 22:41:21.122645184 +0100 | |
33 | @@ -25,7 +25,7 @@ | |
cbb242b0 | 34 | #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ |
cbb242b0 | 35 | #define SHELL "/bin/sh" /* Default shell */ |
612af2b6 | 36 | #define SULOGIN "/sbin/sulogin" /* Sulogin */ |
cbb242b0 | 37 | -#define INITSCRIPT "/etc/initscript" /* Initscript. */ |
6c6a80f7 | 38 | +#define INITSCRIPT "/etc/rc.d/rc.init" /* Initscript. */ |
b299aa8c | 39 | #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */ |
40 | ||
cbb242b0 | 41 | #if 0 |
b299aa8c | 42 | diff -Nru sysvinit-2.85.orig/src/utmpdump.c sysvinit-2.85/src/utmpdump.c |
43 | --- sysvinit-2.85.orig/src/utmpdump.c Tue Sep 12 23:14:24 2000 | |
44 | +++ sysvinit-2.85/src/utmpdump.c Thu Apr 24 12:05:06 2003 | |
45 | @@ -265,14 +265,14 @@ | |
69d66f10 | 46 | } |
47 | ||
48 | if (optind < argc) { | |
49 | - fprintf(stderr, "Utmp %sdump of %s\n", reverse ? "un" : "", argv[optind]); | |
50 | + fprintf(stderr, "Utmpx %sdump of %s\n", reverse ? "un" : "", argv[optind]); | |
51 | if ((fp = fopen(argv[optind], "r")) == NULL) { | |
52 | perror("Unable to open file"); | |
53 | exit(1); | |
54 | } | |
55 | } | |
56 | else { | |
57 | - fprintf(stderr, "Utmp %sdump of stdin\n", reverse ? "un" : ""); | |
58 | + fprintf(stderr, "Utmpx %sdump of stdin\n", reverse ? "un" : ""); | |
59 | fp = stdin; | |
60 | } | |
cbb242b0 | 61 |