summaryrefslogtreecommitdiff
path: root/mkinitramfs
diff options
context:
space:
mode:
authorJeff Bailey <jbailey@ubuntu.com>2005-09-17 16:45:40 -0400
committerJeff Bailey <jbailey@ubuntu.com>2005-09-17 16:45:40 -0400
commit5582f19f77d283348d946dd4cafcbc2134a3186c (patch)
treec24e3b745525cc22c5ff4265734d0fa04b652058 /mkinitramfs
parent61afce26f88ffc9ee2537f16fb4f3eaa82658af7 (diff)
downloadinitramfs-tools-5582f19f77d283348d946dd4cafcbc2134a3186c.tar.gz
initramfs-tools-5582f19f77d283348d946dd4cafcbc2134a3186c.zip
initramfs-tools (0.26) breezy; urgency=low
"Experience is one thing you can't get for nothing." - Oscar Wilde * scripts/local-top/lvm: Reduce -- to - in VG strings for feeding to vgchange. (Ubuntu: #13387) * update-initramfs: New file * debian/dirs: Add /var/lib/initramfs-tools * hooks/evms: New file * scripts/local-top: New file. * debian/control: Bump klibc depends to 1.0.14-1ubuntu2 for jfs support * hook-scripts (manual_add_modules): Don't do unnecessary depmod (dep_add_modules): No need for a sleep 2 here. Thanks to Matt Zimmmerman for noticing these! * scripts/functions: Attempt resume before loading USB or Network modules to avoid resume issues with USB. Thanks to Matthew Garrett for this patch! * scripts/functions (ide_boot_events): Always load ide-generic before going further. This allows us to catch any hidden IDE controllers that might not otherwise get found. * initramfs.conf.5: New file * debian/initramfs-tools.manpages: Install it. Thanks to maximilian attems for the manpage! * hook-functions (auto_add_modules): Add mptscsih (Ubuntu #15406) Thanks to Jesper Krogh for the bug report! * debian/dirs: Add etc/mkinitramfs/hooks, move all scripts subdirs into etc/mkinitramfs/scripts. * mkinitramfs: Set the umask. Copy the scripts from /etc/mkinitramfs/scripts into the image. Make sure that modules file lists is actually a regular file. * init: Use ${rootmnt} instead of hardcoded /root, use mount -n Fix typo. * hook-functions (catenate_cpiogz): Add sanity check. (add_modules_from_file): Document, quote variable, add warning. * docs/example_hook: Update Thanks to Karl Hegbloom for these previous 5 patches! * init: Create /var/lock on the initramfs Thanks to Jerry Haltom for noticing this! * debian/dirs: rename to ... * debian/initramfs-tools.dirs: ... this. * scripts/functions (scsi_boot_events): Don't attempt to look at ${device}/type if it doesn't actually exist. -- Jeff Bailey <jbailey@ubuntu.com> Wed, 14 Sep 2005 14:12:24 -0400
Diffstat (limited to 'mkinitramfs')
-rw-r--r--mkinitramfs12
1 files changed, 11 insertions, 1 deletions
diff --git a/mkinitramfs b/mkinitramfs
index a93f97c..8257b7f 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -1,5 +1,7 @@
#!/bin/sh
+umask 0022
+
# Defaults
keep="n"
CONFDIR="/etc/mkinitramfs"
@@ -97,7 +99,9 @@ done
# MODULES=list case. Always honour.
for x in ${CONFDIR}/modules /usr/share/initramfs-tools/modules.d/*; do
- add_modules_from_file ${x}
+ if [ -f "${x}" ]; then
+ add_modules_from_file ${x}
+ fi
done
if [ "${MODULES}" = "dep" ]; then
@@ -115,6 +119,12 @@ ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
ln -s /usr/lib/klibc/lib/* ${DESTDIR}/lib
copy_exec /usr/share/initramfs-tools/init /init
cp -a /usr/share/initramfs-tools/scripts/* ${DESTDIR}/scripts
+for f in $(cd /etc/mkinitramfs/scripts && \
+ find . \( -name '*.dpkg*' -prune -o -name '*~' -prune \) \
+ -o -type f -print); do
+ mkdir --parents ${DESTDIR}/scripts/$(dirname ${f})
+cp -p /etc/mkinitramfs/scripts/${f} ${DESTDIR}/scripts/$(dirname ${f})
+done
copy_exec ${CONFDIR}/initramfs.conf /conf
cp -a /etc/udev ${DESTDIR}/etc