source: patches/sysvinit-2.88dsf-tools_updates-1.patch@ 603873a

sysvinit
Last change on this file since 603873a was 0e9dcd5, checked in by William Harrington <kb0iic@…>, 11 years ago

Use the proper entity for the patch from patches.ent.

  • Property mode set to 100644
File size: 2.6 KB
  • sysvinit-2.88dsf

    Submitted By: William Harrington (kb0iic at cross-lfs dot org)
    Date: 2014-05-16
    Initial Package Version: 2.88dsf
    Origin: Idea for cleaning up boot chapter by Chris Staub
    Upstream Status: Not Applied - CLFS Specific
    Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
    
    diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
    old new  
    1616# For some known distributions we do not build all programs, otherwise we do.
    1717BIN     =
    1818SBIN    = init halt shutdown runlevel killall5 fstab-decode
    19 USRBIN  = last mesg
    2019
    21 MAN1    = last.1 lastb.1 mesg.1
    2220MAN5    = initscript.5 inittab.5
    2321MAN8    = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
    2422MAN8    += shutdown.8 telinit.8 fstab-decode.8
    2523
    2624ifeq ($(DISTRO),)
    27 BIN     += mountpoint
    28 SBIN    += sulogin bootlogd
    29 USRBIN  += utmpdump wall
    30 MAN1    += utmpdump.1 mountpoint.1 wall.1
    31 MAN8    += sulogin.8 bootlogd.8
     25SBIN    += bootlogd
     26MAN8    += bootlogd.8
    3227endif
    3328
    3429ifeq ($(DISTRO),Debian)
    3530CPPFLAGS+= -DACCTON_OFF
    36 BIN     += mountpoint
    37 SBIN    += sulogin bootlogd
    38 MAN1    += mountpoint.1
    39 MAN8    += sulogin.8 bootlogd.8
     31SBIN    += bootlogd
     32MAN8    += bootlogd.8
    4033endif
    4134
    4235ifeq ($(DISTRO),Owl)
     
    4639
    4740ifeq ($(DISTRO),SuSE)
    4841CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
    49 BIN     += mountpoint
    50 SBIN    += sulogin
    51 USRBIN  += utmpdump
    52 MAN1    += utmpdump.1 mountpoint.1
    53 MAN8    += sulogin.8
     42SBIN    +=
     43MAN8    +=
    5444endif
    5545
    5646ID              = $(shell id -u)
     
    7868endif
    7969
    8070# Additional libs for GNU libc.
    81 ifneq ($(wildcard /usr/lib*/libcrypt.a),)
     71ifneq ($(wildcard /tools/lib*/libcrypt.a),)
    8272  SULOGINLIBS   += -lcrypt
    8373endif
    8474
     
    9686
    9787last:           last.o oldutmp.h
    9888
    99 mesg:           mesg.o
    10089
    101 mountpoint:     mountpoint.o
    10290
    103 utmpdump:       utmpdump.o
    10491
    10592runlevel:       runlevel.o
    10693
  • sysvinit-2.88dsf

    diff -Naur sysvinit-2.88dsf.orig/src/paths.h sysvinit-2.88dsf/src/paths.h
    old new  
    2626#define CONSOLE         "/dev/console"          /* Logical system console */
    2727#define SECURETTY       "/etc/securetty"        /* List of root terminals */
    2828#define SDALLOW         "/etc/shutdown.allow"   /* Users allowed to shutdown */
    29 #define INITTAB         "/etc/inittab"          /* Location of inittab */
     29#define INITTAB         "/tools/etc/inittab"            /* Location of inittab */
    3030#define INIT            "/sbin/init"            /* Location of init itself. */
    3131#define NOLOGIN         "/etc/nologin"          /* Stop user logging in. */
    3232#define FASTBOOT        "/fastboot"             /* Enable fast boot. */
Note: See TracBrowser for help on using the repository browser.