diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-18 14:36:21 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-18 14:57:01 +0000 |
commit | ed669bc46f5796014d7a5785f0deaff9659eeaad (patch) | |
tree | e36f0ec5e7b480145b9a6b79daa30cdfe462c235 | |
parent | db054160522546a1ad1110aa9bedc8dae456e3f0 (diff) | |
download | mkinitfs-ed669bc46f5796014d7a5785f0deaff9659eeaad.tar.bz2 mkinitfs-ed669bc46f5796014d7a5785f0deaff9659eeaad.tar.xz |
move files.d/* and modules.d/* to features.d/*.{files,modules}
-rw-r--r-- | Makefile | 64 | ||||
-rw-r--r-- | features.d/ata.modules (renamed from modules.d/ata) | 0 | ||||
-rw-r--r-- | features.d/base.files (renamed from files.d/base) | 0 | ||||
-rw-r--r-- | features.d/base.modules (renamed from modules.d/base) | 0 | ||||
-rw-r--r-- | features.d/bootchart.files (renamed from files.d/bootchart) | 0 | ||||
-rw-r--r-- | features.d/btrfs.modules (renamed from modules.d/btrfs) | 0 | ||||
-rw-r--r-- | features.d/cdrom.modules (renamed from modules.d/cdrom) | 0 | ||||
-rw-r--r-- | features.d/cramfs.modules (renamed from modules.d/cramfs) | 0 | ||||
-rw-r--r-- | features.d/cryptsetup.files (renamed from files.d/cryptsetup) | 0 | ||||
-rw-r--r-- | features.d/cryptsetup.modules (renamed from modules.d/cryptsetup) | 0 | ||||
-rw-r--r-- | features.d/ext2.modules (renamed from modules.d/ext2) | 0 | ||||
-rw-r--r-- | features.d/ext3.modules (renamed from modules.d/ext3) | 0 | ||||
-rw-r--r-- | features.d/ext4.modules (renamed from modules.d/ext4) | 0 | ||||
-rw-r--r-- | features.d/f2fs.modules (renamed from modules.d/f2fs) | 0 | ||||
-rw-r--r-- | features.d/floppy.modules (renamed from modules.d/floppy) | 0 | ||||
-rw-r--r-- | features.d/gfs2.modules (renamed from modules.d/gfs2) | 0 | ||||
-rw-r--r-- | features.d/jfs.modules (renamed from modules.d/jfs) | 0 | ||||
-rw-r--r-- | features.d/keymap.files (renamed from files.d/keymap) | 0 | ||||
-rw-r--r-- | features.d/kms.files (renamed from files.d/kms) | 0 | ||||
-rw-r--r-- | features.d/kms.modules (renamed from modules.d/kms) | 0 | ||||
-rw-r--r-- | features.d/lvm.files (renamed from files.d/lvm) | 0 | ||||
-rw-r--r-- | features.d/lvm.modules (renamed from modules.d/lvm) | 0 | ||||
-rw-r--r-- | features.d/network.files (renamed from files.d/network) | 0 | ||||
-rw-r--r-- | features.d/network.modules (renamed from modules.d/network) | 0 | ||||
-rw-r--r-- | features.d/ocfs2.modules (renamed from modules.d/ocfs2) | 0 | ||||
-rw-r--r-- | features.d/raid.modules (renamed from modules.d/raid) | 0 | ||||
-rw-r--r-- | features.d/reiserfs.modules (renamed from modules.d/reiserfs) | 0 | ||||
-rw-r--r-- | features.d/scsi.modules (renamed from modules.d/scsi) | 0 | ||||
-rw-r--r-- | features.d/squashfs.modules (renamed from modules.d/squashfs) | 0 | ||||
-rw-r--r-- | features.d/ubifs.modules (renamed from modules.d/ubifs) | 0 | ||||
-rw-r--r-- | features.d/usb.modules (renamed from modules.d/usb) | 0 | ||||
-rw-r--r-- | features.d/virtio.modules (renamed from modules.d/virtio) | 0 | ||||
-rw-r--r-- | features.d/xfs.modules (renamed from modules.d/xfs) | 0 | ||||
-rwxr-xr-x | mkinitfs.in | 26 |
34 files changed, 46 insertions, 44 deletions
@@ -8,38 +8,38 @@ datadir ?= $(datarootdir)/mkinitfs SBIN_FILES := mkinitfs bootchartd mkinitfs-rundep SHARE_FILES := initramfs-init fstab passwd group CONF_FILES := mkinitfs.conf \ - modules.d/ata \ - modules.d/base \ - modules.d/btrfs \ - modules.d/cdrom \ - modules.d/cramfs \ - modules.d/cryptsetup \ - modules.d/ext2 \ - modules.d/ext3 \ - modules.d/ext4 \ - modules.d/f2fs \ - modules.d/floppy \ - modules.d/gfs2 \ - modules.d/jfs \ - modules.d/kms \ - modules.d/lvm \ - modules.d/network \ - modules.d/ocfs2 \ - modules.d/raid \ - modules.d/reiserfs \ - modules.d/scsi \ - modules.d/squashfs \ - modules.d/ubifs \ - modules.d/usb \ - modules.d/virtio \ - modules.d/xfs \ - files.d/bootchart \ - files.d/base \ - files.d/cryptsetup \ - files.d/network \ - files.d/keymap \ - files.d/kms \ - files.d/lvm + features.d/ata.modules \ + features.d/base.files \ + features.d/base.modules \ + features.d/bootchart.files \ + features.d/btrfs.modules \ + features.d/cdrom.modules \ + features.d/cramfs.modules \ + features.d/cryptsetup.files \ + features.d/cryptsetup.modules \ + features.d/ext2.modules \ + features.d/ext3.modules \ + features.d/ext4.modules \ + features.d/f2fs.modules \ + features.d/floppy.modules \ + features.d/gfs2.modules \ + features.d/jfs.modules \ + features.d/keymap.files \ + features.d/kms.files \ + features.d/kms.modules \ + features.d/lvm.files \ + features.d/lvm.modules \ + features.d/network.files \ + features.d/network.modules \ + features.d/ocfs2.modules \ + features.d/raid.modules \ + features.d/reiserfs.modules \ + features.d/scsi.modules \ + features.d/squashfs.modules \ + features.d/ubifs.modules \ + features.d/usb.modules \ + features.d/virtio.modules \ + features.d/xfs.modules SCRIPTS := $(SBIN_FILES) initramfs-init IN_FILES := $(addsuffix .in,$(SCRIPTS)) diff --git a/modules.d/ata b/features.d/ata.modules index 2a68a98..2a68a98 100644 --- a/modules.d/ata +++ b/features.d/ata.modules diff --git a/files.d/base b/features.d/base.files index d99f556..d99f556 100644 --- a/files.d/base +++ b/features.d/base.files diff --git a/modules.d/base b/features.d/base.modules index 038335d..038335d 100644 --- a/modules.d/base +++ b/features.d/base.modules diff --git a/files.d/bootchart b/features.d/bootchart.files index 8adf4df..8adf4df 100644 --- a/files.d/bootchart +++ b/features.d/bootchart.files diff --git a/modules.d/btrfs b/features.d/btrfs.modules index b5a271f..b5a271f 100644 --- a/modules.d/btrfs +++ b/features.d/btrfs.modules diff --git a/modules.d/cdrom b/features.d/cdrom.modules index 038c4a2..038c4a2 100644 --- a/modules.d/cdrom +++ b/features.d/cdrom.modules diff --git a/modules.d/cramfs b/features.d/cramfs.modules index 65c9c5f..65c9c5f 100644 --- a/modules.d/cramfs +++ b/features.d/cramfs.modules diff --git a/files.d/cryptsetup b/features.d/cryptsetup.files index e9810ef..e9810ef 100644 --- a/files.d/cryptsetup +++ b/features.d/cryptsetup.files diff --git a/modules.d/cryptsetup b/features.d/cryptsetup.modules index 9b63cd3..9b63cd3 100644 --- a/modules.d/cryptsetup +++ b/features.d/cryptsetup.modules diff --git a/modules.d/ext2 b/features.d/ext2.modules index 242edcb..242edcb 100644 --- a/modules.d/ext2 +++ b/features.d/ext2.modules diff --git a/modules.d/ext3 b/features.d/ext3.modules index eeadf78..eeadf78 100644 --- a/modules.d/ext3 +++ b/features.d/ext3.modules diff --git a/modules.d/ext4 b/features.d/ext4.modules index a5bb1c3..a5bb1c3 100644 --- a/modules.d/ext4 +++ b/features.d/ext4.modules diff --git a/modules.d/f2fs b/features.d/f2fs.modules index b16edae..b16edae 100644 --- a/modules.d/f2fs +++ b/features.d/f2fs.modules diff --git a/modules.d/floppy b/features.d/floppy.modules index 5677a9a..5677a9a 100644 --- a/modules.d/floppy +++ b/features.d/floppy.modules diff --git a/modules.d/gfs2 b/features.d/gfs2.modules index 40ecf79..40ecf79 100644 --- a/modules.d/gfs2 +++ b/features.d/gfs2.modules diff --git a/modules.d/jfs b/features.d/jfs.modules index 8d4413a..8d4413a 100644 --- a/modules.d/jfs +++ b/features.d/jfs.modules diff --git a/files.d/keymap b/features.d/keymap.files index bf4d39a..bf4d39a 100644 --- a/files.d/keymap +++ b/features.d/keymap.files diff --git a/files.d/kms b/features.d/kms.files index 9d198b2..9d198b2 100644 --- a/files.d/kms +++ b/features.d/kms.files diff --git a/modules.d/kms b/features.d/kms.modules index 8806aab..8806aab 100644 --- a/modules.d/kms +++ b/features.d/kms.modules diff --git a/files.d/lvm b/features.d/lvm.files index be92c9f..be92c9f 100644 --- a/files.d/lvm +++ b/features.d/lvm.files diff --git a/modules.d/lvm b/features.d/lvm.modules index 92f0721..92f0721 100644 --- a/modules.d/lvm +++ b/features.d/lvm.modules diff --git a/files.d/network b/features.d/network.files index 79f90d3..79f90d3 100644 --- a/files.d/network +++ b/features.d/network.files diff --git a/modules.d/network b/features.d/network.modules index 8397498..8397498 100644 --- a/modules.d/network +++ b/features.d/network.modules diff --git a/modules.d/ocfs2 b/features.d/ocfs2.modules index 910935a..910935a 100644 --- a/modules.d/ocfs2 +++ b/features.d/ocfs2.modules diff --git a/modules.d/raid b/features.d/raid.modules index afd3867..afd3867 100644 --- a/modules.d/raid +++ b/features.d/raid.modules diff --git a/modules.d/reiserfs b/features.d/reiserfs.modules index 9199d52..9199d52 100644 --- a/modules.d/reiserfs +++ b/features.d/reiserfs.modules diff --git a/modules.d/scsi b/features.d/scsi.modules index 62a2810..62a2810 100644 --- a/modules.d/scsi +++ b/features.d/scsi.modules diff --git a/modules.d/squashfs b/features.d/squashfs.modules index bf93fbc..bf93fbc 100644 --- a/modules.d/squashfs +++ b/features.d/squashfs.modules diff --git a/modules.d/ubifs b/features.d/ubifs.modules index 8c95455..8c95455 100644 --- a/modules.d/ubifs +++ b/features.d/ubifs.modules diff --git a/modules.d/usb b/features.d/usb.modules index acf6b6f..acf6b6f 100644 --- a/modules.d/usb +++ b/features.d/usb.modules diff --git a/modules.d/virtio b/features.d/virtio.modules index fa74c10..fa74c10 100644 --- a/modules.d/virtio +++ b/features.d/virtio.modules diff --git a/modules.d/xfs b/features.d/xfs.modules index f577bf3..f577bf3 100644 --- a/modules.d/xfs +++ b/features.d/xfs.modules diff --git a/mkinitfs.in b/mkinitfs.in index a7dd090..7b52196 100755 --- a/mkinitfs.in +++ b/mkinitfs.in @@ -29,13 +29,14 @@ _cp() { } feature_files() { - local dir="$1" - local glob file + local suffix="$1" + local dir="$features_dir" + local glob file for f in $features; do - if [ ! -f "$dir/$f" ]; then + if [ ! -f "$dir/$f.$suffix" ]; then continue fi - for glob in $(sed 's:^/\+::' "$dir/$f"); do + for glob in $(sed 's:^/\+::' "$dir/$f.$suffix"); do for file in $glob; do if [ -d $file ]; then find $file -type f @@ -56,7 +57,7 @@ initfs_base() { [ -z "$list_sources" ] && mkdir -p $dirs cd "${basedir:-/}" - for file in $(feature_files "$filelists_dir"); do + for file in $(feature_files files); do _cp $file done @@ -107,12 +108,12 @@ BEGIN { END { for (i in mod) recursedeps(i); -}' +}' } find_kmods() { cd "$kerneldir" || return 1 - for file in $(feature_files $modulelists_dir); do + for file in $(feature_files modules); do if ! [ -e ${file} ]; then echo "$file: No such file or directory" >&2 continue @@ -193,14 +194,15 @@ done shift $(( $OPTIND - 1 )) . $(readlink -f "$config") -filelists_dir=${filelists_dir:-"$sysconfdir/files.d"} -modulelists_dir=${modules_dir:-"$sysconfdir/modules.d"} +features_dir=${features_dir:-"$sysconfdir/features.d"} [ -n "$myfeatures" ] && features="$myfeatures" if [ -n "$list_features" ]; then - for i in $filelists_dir $modulelists_dir; do - ( [ -d "$i" ] && cd $i && ls ) - done | sort | uniq + for i in $features_dir/*.files $features_dir/*.modules; do + [ -e "$i" ] || continue + local file=${i##*/} + echo ${file%.*} + done | sort -u exit 0 fi |