From 1d78033ebede16f4db1421ac366503dc0db04ad3 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sun, 30 Sep 2018 19:33:42 -0500 Subject: [PATCH] The following changes were made: * moved directory creation to package itself instead of usher * moved inittab installation from usher to CONFIG --- {SNAP => CONFIG/etc}/inittab | 0 Makefile | 7 +++++-- SNAP/usher | 23 ----------------------- 3 files changed, 5 insertions(+), 25 deletions(-) rename {SNAP => CONFIG/etc}/inittab (100%) delete mode 100755 SNAP/usher diff --git a/SNAP/inittab b/CONFIG/etc/inittab similarity index 100% rename from SNAP/inittab rename to CONFIG/etc/inittab diff --git a/Makefile b/Makefile index 7cabb05..2ebfb4b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ 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 = 10 +SNAPVER = 11 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -55,9 +55,12 @@ $(ROOT): $(SRCDIR)/src/init fi @cd $(SRCDIR) && make -C src install ROOT=$(ROOT) && \ + for char in S 0 1 2 3 4 5 6; do \ + install -v -d -m 755 $(ROOT)/etc/rc$$char.d; \ + done && \ + install -v -d -m 755 $(ROOT)/etc/init.d && \ install -v -d -m 755 $(ROOT)/usr/share/sysvinit && \ install -v -d -m 755 $(ROOT)/bin && \ - install -v -m 644 $(SNAPDIR)/inittab $(ROOT)/usr/share/sysvinit && \ ln -sv ../sbin/killall5 $(ROOT)/bin/pidof clean: diff --git a/SNAP/usher b/SNAP/usher deleted file mode 100755 index 794b5ec..0000000 --- a/SNAP/usher +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -case $1 in - preinst) - exit 0 - ;; - postinst) - install -d -m 755 /etc/init.d - install -d -m 755 /etc/rc{{0..6},S}.d - - if [ ! -f /etc/inittab ]; then - install -m 644 /usr/share/sysvinit/inittab /etc/inittab - fi - ;; - prerm) - exit 0 - ;; - postrm) - exit 0 - ;; -esac