]>
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 | --- sysvinit-2.85.orig/src/utmpdump.c Tue Sep 12 23:14:24 2000 |
43 | +++ sysvinit-2.85/src/utmpdump.c Thu Apr 24 12:05:06 2003 | |
44 | @@ -265,14 +265,14 @@ | |
69d66f10 | 45 | } |
46 | ||
47 | if (optind < argc) { | |
48 | - fprintf(stderr, "Utmp %sdump of %s\n", reverse ? "un" : "", argv[optind]); | |
49 | + fprintf(stderr, "Utmpx %sdump of %s\n", reverse ? "un" : "", argv[optind]); | |
50 | if ((fp = fopen(argv[optind], "r")) == NULL) { | |
51 | perror("Unable to open file"); | |
52 | exit(1); | |
53 | } | |
54 | } | |
55 | else { | |
56 | - fprintf(stderr, "Utmp %sdump of stdin\n", reverse ? "un" : ""); | |
57 | + fprintf(stderr, "Utmpx %sdump of stdin\n", reverse ? "un" : ""); | |
58 | fp = stdin; | |
59 | } | |
cbb242b0 | 60 | |
8645513a ER |
61 | --- sysvinit-2.86/doc/Propaganda~ 1996-01-02 20:20:54.000000000 +0200 |
62 | +++ sysvinit-2.86/doc/Propaganda 2009-11-23 00:55:49.324465562 +0200 | |
63 | @@ -46,7 +46,7 @@ | |
64 | /var/run/utmp (it's also shown on the command line if you do a "ps"). | |
65 | - unreckognized options are silently ignored (such as the infamous | |
66 | "ro" - mount root file system read only). | |
67 | -- if the file /etc/initscript is present it will be used to launch | |
68 | +- if the file /etc/rc.d/rc.init is present it will be used to launch | |
69 | all programs that init starts (so that you can set a generic | |
70 | umask, ulimit eg for ALL processes - see initscript.sample). | |
71 | - A "sulogin" program added that always asks for the root | |
8645513a ER |
72 | --- sysvinit-2.86/src/initscript.sample~ 1997-11-26 15:06:33.000000000 +0200 |
73 | +++ sysvinit-2.86/src/initscript.sample 2009-11-23 01:00:22.490804927 +0200 | |
74 | @@ -1,14 +1,14 @@ | |
75 | # | |
76 | -# initscript If this script is intalled as /etc/initscript, | |
77 | +# initscript If this script is intalled as /etc/rc.d/rc.init, | |
78 | # it is executed by init(8) for every program it | |
79 | # wants to spawn like this: | |
80 | # | |
81 | -# /bin/sh /etc/initscript <id> <level> <action> <process> | |
82 | +# /bin/sh /etc/rc.d/rc.init <id> <level> <action> <process> | |
83 | # | |
84 | # It can be used to set the default umask and ulimit | |
85 | # of all processes. By default this script is installed | |
86 | # as /etc/initscript.sample, so to enable it you must | |
87 | -# rename this script first to /etc/initscript. | |
88 | +# rename this script first to /etc/rc.d/rc.init. | |
89 | # | |
90 | # Version: @(#)initscript 1.10 10-Dec-1995 MvS. | |
91 | # |