home: hub: mkinitfs

Info  •  Files  •  Log

configurable sysconfdir, datarootdir and datadir

--- a/Makefile

+++ b/Makefile

@@ -1,6 +1,10 @@

 VERSION		:= 1.1

+sysconfdir	?= /etc/mkinitfs

+datarootdir	?= /usr/share

+datadir		?= $(datarootdir)/mkinitfs

+

 SBIN_FILES	:= mkinitfs bootchartd

 SHARE_FILES	:= initramfs-init

 CONF_FILES	:= mkinitfs.conf \

@@ -31,10 +35,16 @@

 INSTALL		:= install

 SED		:= sed

-SED_REPLACE	:= -e 's:@VERSION@:$(FULL_VERSION):g'

+SED_REPLACE	:= -e 's:@VERSION@:$(FULL_VERSION):g' \

+		-e 's:@sysconfdir@:$(sysconfdir):g' \

+		-e 's:@datadir@:$(datadir):g'

 all:	$(SCRIPTS)

+

+clean:

+	rm -f $(SCRIPTS)

+

 help:

 	@echo mkinitfs $(VERSION)

 	@echo "usage: make install [DESTDIR=]"

--- a/mkinitfs.in

+++ b/mkinitfs.in

@@ -1,7 +1,13 @@

 #!/bin/sh

 VERSION=@VERSION@

+sysconfdir=@sysconfdir@

+datadir=@datadir@

+config="$sysconfidir"/mkinitfs.conf

+init="$datadir"/initramfs-init

+startdir=$PWD

+

 _cp() {

 	local i

 	if [ -n "$list_sources" ]; then

@@ -132,9 +138,6 @@

 # main

-startdir=$PWD

-config=/etc/mkinitfs/mkinitfs.conf

-init=/usr/share/mkinitfs/initramfs-init

 while getopts "b:c:hi:kLlo:t:" opt; do

 	case "$opt" in

@@ -153,9 +156,9 @@

 done

 shift $(( $OPTIND - 1 ))

-. "$config"

-filelists_dir=${filelists_dir:-"/etc/mkinitfs/files.d"}

-modulelists_dir=${modules_dir:-"/etc/mkinitfs/modules.d"}

+. $(readlink -f "$config")

+filelists_dir=${filelists_dir:-"$sysconfdir/files.d"}

+modulelists_dir=${modules_dir:-"$sysconfdir/modules.d"}

 [ -n "$myfeatures" ] && features="$myfeatures"

 if [ -n "$list_features" ]; then