| [0e9dcd5] | 1 | Submitted By: William Harrington (kb0iic at cross-lfs dot org) |
|---|
| 2 | Date: 2014-05-16 |
|---|
| 3 | Initial Package Version: 2.88dsf |
|---|
| 4 | Origin: Idea for cleaning up boot chapter by Chris Staub |
|---|
| 5 | Upstream Status: Not Applied - CLFS Specific |
|---|
| 6 | Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible. |
|---|
| 7 | |
|---|
| [0d68a5c] | 8 | diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile |
|---|
| 9 | --- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 05:30:27.000000000 -0400 |
|---|
| 10 | +++ sysvinit-2.88dsf/src/Makefile 2014-04-14 17:00:32.000000000 -0400 |
|---|
| 11 | @@ -16,27 +16,20 @@ |
|---|
| 12 | # For some known distributions we do not build all programs, otherwise we do. |
|---|
| 13 | BIN = |
|---|
| 14 | SBIN = init halt shutdown runlevel killall5 fstab-decode |
|---|
| 15 | -USRBIN = last mesg |
|---|
| 16 | |
|---|
| 17 | -MAN1 = last.1 lastb.1 mesg.1 |
|---|
| 18 | MAN5 = initscript.5 inittab.5 |
|---|
| 19 | MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 |
|---|
| 20 | MAN8 += shutdown.8 telinit.8 fstab-decode.8 |
|---|
| 21 | |
|---|
| 22 | ifeq ($(DISTRO),) |
|---|
| 23 | -BIN += mountpoint |
|---|
| 24 | -SBIN += sulogin bootlogd |
|---|
| 25 | -USRBIN += utmpdump wall |
|---|
| 26 | -MAN1 += utmpdump.1 mountpoint.1 wall.1 |
|---|
| 27 | -MAN8 += sulogin.8 bootlogd.8 |
|---|
| 28 | +SBIN += bootlogd |
|---|
| 29 | +MAN8 += bootlogd.8 |
|---|
| 30 | endif |
|---|
| 31 | |
|---|
| 32 | ifeq ($(DISTRO),Debian) |
|---|
| 33 | CPPFLAGS+= -DACCTON_OFF |
|---|
| 34 | -BIN += mountpoint |
|---|
| 35 | -SBIN += sulogin bootlogd |
|---|
| 36 | -MAN1 += mountpoint.1 |
|---|
| 37 | -MAN8 += sulogin.8 bootlogd.8 |
|---|
| 38 | +SBIN += bootlogd |
|---|
| 39 | +MAN8 += bootlogd.8 |
|---|
| 40 | endif |
|---|
| 41 | |
|---|
| 42 | ifeq ($(DISTRO),Owl) |
|---|
| 43 | @@ -46,11 +39,8 @@ |
|---|
| 44 | |
|---|
| 45 | ifeq ($(DISTRO),SuSE) |
|---|
| 46 | CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE |
|---|
| 47 | -BIN += mountpoint |
|---|
| 48 | -SBIN += sulogin |
|---|
| 49 | -USRBIN += utmpdump |
|---|
| 50 | -MAN1 += utmpdump.1 mountpoint.1 |
|---|
| 51 | -MAN8 += sulogin.8 |
|---|
| 52 | +SBIN += |
|---|
| 53 | +MAN8 += |
|---|
| 54 | endif |
|---|
| 55 | |
|---|
| 56 | ID = $(shell id -u) |
|---|
| 57 | @@ -78,7 +68,7 @@ |
|---|
| 58 | endif |
|---|
| 59 | |
|---|
| 60 | # Additional libs for GNU libc. |
|---|
| 61 | -ifneq ($(wildcard /usr/lib*/libcrypt.a),) |
|---|
| 62 | +ifneq ($(wildcard /tools/lib*/libcrypt.a),) |
|---|
| 63 | SULOGINLIBS += -lcrypt |
|---|
| 64 | endif |
|---|
| 65 | |
|---|
| 66 | @@ -96,11 +86,8 @@ |
|---|
| 67 | |
|---|
| 68 | last: last.o oldutmp.h |
|---|
| 69 | |
|---|
| 70 | -mesg: mesg.o |
|---|
| 71 | |
|---|
| 72 | -mountpoint: mountpoint.o |
|---|
| 73 | |
|---|
| 74 | -utmpdump: utmpdump.o |
|---|
| 75 | |
|---|
| 76 | runlevel: runlevel.o |
|---|
| 77 | |
|---|
| 78 | diff -Naur sysvinit-2.88dsf.orig/src/paths.h sysvinit-2.88dsf/src/paths.h |
|---|
| 79 | --- sysvinit-2.88dsf.orig/src/paths.h 2010-04-11 05:30:27.000000000 -0400 |
|---|
| 80 | +++ sysvinit-2.88dsf/src/paths.h 2014-04-14 17:00:36.000000000 -0400 |
|---|
| 81 | @@ -26,7 +26,7 @@ |
|---|
| 82 | #define CONSOLE "/dev/console" /* Logical system console */ |
|---|
| 83 | #define SECURETTY "/etc/securetty" /* List of root terminals */ |
|---|
| 84 | #define SDALLOW "/etc/shutdown.allow" /* Users allowed to shutdown */ |
|---|
| 85 | -#define INITTAB "/etc/inittab" /* Location of inittab */ |
|---|
| 86 | +#define INITTAB "/tools/etc/inittab" /* Location of inittab */ |
|---|
| 87 | #define INIT "/sbin/init" /* Location of init itself. */ |
|---|
| 88 | #define NOLOGIN "/etc/nologin" /* Stop user logging in. */ |
|---|
| 89 | #define FASTBOOT "/fastboot" /* Enable fast boot. */ |
|---|
