From 69a8473becf9bb68f9240d433c2312f9a005657e Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Thu, 29 Mar 2018 13:04:07 -0500 Subject: [PATCH] The following changes were made: * Added REPO to Makefile * usher now uses /bin/sh * Removed TARGET from usher --- Makefile | 3 ++- SNAP/usher | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b30388a..6ae5e66 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,11 @@ DEPENDS = glibc ARCH = x86_64 URL = https://savannah.nongnu.org/projects/sysvinit +REPO = core BRIEF = System that manages boot and shutdown DESC = System V style init programs original written by Miquel van Smoorenburg \ that control the booting and shutdown of your system -SNAPVER = 8 +SNAPVER = 9 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') diff --git a/SNAP/usher b/SNAP/usher index f4cb8d6..794b5ec 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -7,11 +7,11 @@ case $1 in exit 0 ;; postinst) - install -d -m 755 ${TARGET}/etc/init.d - install -d -m 755 ${TARGET}/etc/rc{{0..6},S}.d + install -d -m 755 /etc/init.d + install -d -m 755 /etc/rc{{0..6},S}.d - if [ ! -f ${TARGET}/etc/inittab ]; then - install -m 644 ${TARGET}/usr/share/sysvinit/inittab ${TARGET}/etc/inittab + if [ ! -f /etc/inittab ]; then + install -m 644 /usr/share/sysvinit/inittab /etc/inittab fi ;; prerm)