summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-17lsinitramfs: be more defensive against cmdline optionsMichael Prokop
* make sure the specified file(s) can be read * redirect error message to stderr * support -h/--help option * variable quoting Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-17Add lsinitramfs to initramfs-toolsmaximilian attems
useful script to quickly look into initramfs for debugger or bug reporter, inspired by similar dracut tool. Signed-off-by: maximilian attems <maks@debian.org>
2010-06-17mkinitramfs: No point in hardcoding busybox pathmaximilian attems
should make merge for Ubuntu easier. Thanks to David Greaves in LP: #573282 for the idea. Signed-off-by: maximilian attems <maks@debian.org>
2010-06-17scripts/functions: On panic change to tty1 if chvt aroundmaximilian attems
To make sure the user can read any error messages displayed. (LP: #243226) usplash and other may cause the user to land somewhere, where nothing is displayed. merge from Ubuntu with adding conditional chvt invocation, as it may not be around. Thanks: Luke Yelavich <themuso@ubuntu.com> Thanks: Colin Watson <cjwatson@ubuntu.com> Signed-off-by: maximilian attems <maks@debian.org>
2010-06-17pre_mountroot(): reduce timeout to 30 secondsmaximilian attems
giant disk arrays, clusters will need to provide their own rootdelay= boot arg, they should have capable admins. 3 minutes wait is just too long for regular users. sync from ubuntu 0.96.1ubuntu1. Acked-by: Michael Prokop <mika@debian.org> Signed-off-by: maximilian attems <maks@debian.org>
2010-06-17maintainer-notes.html: extend contribution section, rewrap + fix ↵Michael Prokop
git-dch/git-buildpackage commandline Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-17move maintainer-notes.html to docs/ and install as ↵Michael Prokop
/usr/share/doc/initramfs-tools/maintainer-notes.html Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-17maintainer-notes.html: fix git-dch commandline.Michael Prokop
Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-17initial version of maintainer-notes.htmlMichael Prokop
2010-06-16Merge branch 'master' of ↵maximilian attems
git+ssh://git.debian.org/srv/git.debian.org/git/kernel/initramfs-tools
2010-06-16get_fstype: reference blkid in commentmaximilian attems
the removal of vol_id compat code as requested in #585419 is to early as we need it for Lenny upgrades. Nevertheless have the comment point to the newer tool. :) Thanks: Christoph Anton Mitterer <calestyo@scientia.net> Signed-off-by: maximilian attems <maks@debian.org>
2010-06-16hook-functions: do not install ubi module by default via auto_add_modules()Michael Prokop
d-i does not support UBI/UBIFS yet and adding ubi.ko it by default to initrd when MODULES=most is set doesn't provide any benefits yet. Therefore don't waste ~125kb disk space by default, instead leave the installation of ubi to d-i through a hook. Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-16hook-functions/init/scripts/local: add support for ubifs.Martin Michlmayr
MODULES=dep fails when / is ubifs. This patch adds support for something like root=ubi0:rootfs when ubi is modular. Quoting Martin: It essentially does three things: - adds the correct modules to the ramdisk (for MODULES=dep and MODULES=most) - reads ubi.mtd= from the command line - loads ubi with the ubi.mtd info and ignores the "Waiting for root" check I've successfully tested this with a kernel with modular ubi and with the following boot variants: console=ttyS0,115200 ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs console=ttyS0,115200 ubi.mtd=2 root=ubi0_0 rootfstype=ubifs With console=ttyS0,115200 ubi.mtd=2 root=/dev/ubi0_0 rootfstype=ubifs I get an error that it cannot mount root but I suspect this is an ubifs error and has nothing to do with i-t (since at this point I can manually mount it with -t ubifs ubi0_0 whereas the /dev/ variant doesn't work). Tested with MODULES=dep and MODULES=most as well as with a kernel that has ubifs built in. Closes: #582858 Thanks: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Reviewed-by: Michael Prokop <mika@debian.org>
2010-06-16initramfs-tools: work around 'find -printf %Y' bugColin Watson
The change to filter out looping or broken symlinks from the initramfs, written by me for Ubuntu and applied to Debian for #575157, tickles a bug in find (which I think also had an associated Debian bug, but I've been unable to find it): https://savannah.gnu.org/bugs/index.php?29460 This was fixed in 4.5.8, which is currently only in experimental. In any case findutils is very deep in the dependency chain for upgrades and I believe it would be a good idea to avoid requiring a new version of it (I've had problems quite recently with strict dependencies on findutils causing unresolvable dependency loops). The following patch works around this bug in a reasonably straightforward way. [ debian findutils bug was #576772 ] Signed-off-by: maximilian attems <maks@debian.org>
2010-06-16scripts/functions: allow hooks to abort buildMichael Prokop
Execute call_scripts() under "set -e" so hook scripts can exit initrd build iff necessary. Closes: #396388 Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-16Merge branch 'mika/replace-awk-with-sed'Michael Prokop
2010-06-15Merge branch 'mika/submit-mdstat-in-bugreports'Michael Prokop
2010-06-15Merge branch 'mika/devtmpfs'Michael Prokop
2010-06-15debian/script: append /proc/mdstat (iff present) to bugreportsMichael Prokop
Signed-off-by: Michael Prokop <mika@grml.org>
2010-06-15hook-functions: replace awk calls with sed in dep_add_modules()Michael Prokop
If mawk is installed as default awk version it won't handle [:digit:], instead let's replace the grep/awk/shell version with one single sed invocation. Closes: #585991 Thanks: Thorsten Glaser <tg@mirbsd.de> Signed-off-by: Michael Prokop <mika@grml.org>
2010-06-14add bash-completion for update-initramfsMichael Prokop
Closes: #537139 Thanks: David Paleino <dapal@debian.org> Thanks: Stéphane Jourdois <stephane@jourdois.fr> Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-14code cleanup: consequently use "W:" for warnings.Michael Prokop
The only exception is log_warning_msg() inside scripts/functions which is/can be used by external scripts. Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-14code cleanup: consequently replace spaces in indentions with tabs to unify ↵Michael Prokop
coding stile Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-14code cleanup: drop trailing whitespaces.Michael Prokop
Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-14init: display warning message if devtmpfs could not be mounted.Michael Prokop
Older kernel versions (like the one shipped with Lenny) don't support devtmpfs. Therefore display a warning message when falling back to tmpfs. See #501359. Thanks: Ferenc Wagner <wferi@niif.hu> Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-14hook-functions/mkinitramfs/update-initramfs: consequently output error ↵Michael Prokop
messages to stderr Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-13Produce an error when root cannot be determined with MODULES=depMartin Michlmayr
A lot of code in dep_add_modules() uses $root. Therefore, produce an error message if we cannot determine the root device. [ error out on this condtion too. -maks ] Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: maximilian attems <maks@debian.org>
2010-06-13update-initramfs: Fix another unbound variablemaximilian attems
still uncovering things.. Closes: #583695 Signed-off-by: maximilian attems <maks@debian.org>
2010-06-13script: Add update-initramfs.conf to bug reportmaximilian attems
we see lately unbound variables from there, so it's nice to have it. Signed-off-by: maximilian attems <maks@debian.org>
2010-06-08Fix bug number in changelog (#584520 -> #549680) for upload of 0.96.1.Michael Prokop
2010-06-08release 0.96.1.Michael Prokop
Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08Add myself to uploaders.Michael Prokop
ACK-ed by maks on IRC. Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08Add symlinks issue to TODO file.Michael Prokop
2010-06-08mkinitramfs: warn if TMPDIR is mounted noexec + fall back to not cache run ↵Michael Prokop
scripts then If the TMPDIR (/tmp by default) is mounted with noexec the user will notify several lines like: /usr/sbin/mkinitramfs: 276: /tmp/mkinitramfs_Ck5cpl/scripts/init-top/all_generic_ide: Permission denied To get rid of that the user can either point $TMPDIR to a filesystem that's mounted with exec permission or otherwise the cache_run_scripts() feature won't be used. Notify user accordingly with a warning message. [Closes: #576678] Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08dep_add_modules(): handle ubifs and return since ubifs root is a char deviceMichael Prokop
Add additional check to handle ubifs and return since ubifs root is a char device but most of the following commands in dep_add_modules() only work with block devices. Patch by Martin Michlmayr <tbm@cyrius.com> [Closes: #582858] Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08Support dashes inside scripts names.Michael Prokop
[Closes: #566056] Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08hook-functions: make device name handling for /proc/mdstat more flexible for ↵Michael Prokop
MODULES=dep We can't assume it's always [hs]dX# in /proc/mdstat. It can be e.g. also [hs]dX (raw device) or dm-## as well. So don't statically calculate the string based on string length but instead try to be as smart as possible. Also add support for handling additional arguments in the /proc/mdstat output like "(auto-read-only)". This affects MODULES=dep only. [Closes: #584520] + [Closes: #514756] Reported-by: Simon Richter <Simon.Richter@hogyros.de> Reported-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08Document mode vs. mode_option option in framebuffer example script.Michael Prokop
[Closes: #439846] Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-08Make sure copy_exec hook function does not exit with a non-zero return value ↵Michael Prokop
in non-verbose mode. [Closes: #584520] Reported-by: Gerrit Keller <gerrit.keller@gmail.com> Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-02release 0.95.1.Michael Prokop
Signed-off-by: Michael Prokop <mika@debian.org>
2010-06-02update-initramfs: use $* instead of $@Jonathan Nieder
Use "$*" where it makes the quoting behavior easier to understand. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Michael Prokop <mika@debian.org>
2010-06-02update-initramfs: fix unbound variables. [Closes: #583695]Michael Prokop
Signed-off-by: Michael Prokop <mika@debian.org>
2010-05-28release 0.95maximilian attems
Signed-off-by: maximilian attems <maks@debian.org>
2010-05-28hook-functions: Fix copy_modules_dir()maximilian attems
overseen variable renaming. Signed-off-by: maximilian attems <maks@debian.org>
2010-05-28debian/copyright: add boilerplate to keep lintian happy.maximilian attems
shuts up copyright-should-refer-to-common-license-file-for-gpl. Signed-off-by: maximilian attems <maks@debian.org>
2010-05-28initramfs-tools: drop outdated breaksmaximilian attems
all of this software got fixed and was mostly seen in exp, with cryptestup fixed long time ago. Signed-off-by: maximilian attems <maks@debian.org>
2010-05-28Merge branch 'sid'maximilian attems
Conflicts: debian/control
2010-05-28mkinitramfs: fix MODULES=dep on mylex raid devices (DAC960)Claus Herwig
mkinitramfs fails to generate a initrd file for root filesystems on an old mylex raid controller (kernel module DAC960). In my case this breaks installation for lenny (5.0.3) on a FJS Primergy server - as this bug is not only in the mentioned version but also in 0.92 which ships on the lenny install cd: The installer can boot, as the old kernel module is still present. But the base install step fails when it tries to generate the initrd. The error in detail, when invoking mkinitramfs manually with -x ----------- (...) + manual_add_modules ext2 + local mam_x firmwares firmware ++ modprobe --set-version=2.6.29.6-vs2.3.0.36.14-beng --ignore-install --quiet --show-depends ext2 ++ awk '/^insmod/ { print $2 }' + for mam_x in '$(modprobe --set-version="${version}" --ignore-install --quiet --show-depends "${1}" | awk '\''/^insmod/ { print $2 }'\'')' + '[' -e /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/mbcache.ko ']' ++ dirname /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/mbcache.ko + mkdir -p /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs ++ dirname /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/mbcache.ko + ln -s /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/mbcache.ko /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs + '[' n = y ']' ++ modinfo -F firmware /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/mbcache.ko + firmwares= + '[' -z '' ']' + continue + for mam_x in '$(modprobe --set-version="${version}" --ignore-install --quiet --show-depends "${1}" | awk '\''/^insmod/ { print $2 }'\'')' + '[' -e /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2/ext2.ko ']' ++ dirname /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2/ext2.ko + mkdir -p /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2 ++ dirname /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2/ext2.ko + ln -s /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2/ext2.ko /tmp/mkinitramfs_lNjzuV//lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2 + '[' n = y ']' ++ modinfo -F firmware /lib/modules/2.6.29.6-vs2.3.0.36.14-beng/kernel/fs/ext2/ext2.ko + firmwares= + '[' -z '' ']' + continue + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + '[' /dev/rd/c0d0p1 '!=' /dev/rd/c0d0p1 ']' + block=rd/c0d0p1 + block=rd/c + '[' -z rd/c ']' + '[' '!' -e /sys/block/rd/c ']' + echo 'mkinitramfs: for root /dev/rd/c0d0p1 missing rd/c /sys/block/ entry' mkinitramfs: for root /dev/rd/c0d0p1 missing rd/c /sys/block/ entry + echo 'mkinitramfs: workaround is MODULES=most' mkinitramfs: workaround is MODULES=most + echo 'mkinitramfs: Error please report the bug' mkinitramfs: Error please report the bug + exit 1 ------------- So the reason is that mkinitramfs fails to derive the correct block device notation from the root device as the DAC960 driver uses a strange format for it. Once figured out, this is easily corrected. Please find a short patch for /usr/share/initramfs-tools/hook-functions attached. Thank you, Claus Herwig -- CHECON EDV-Consulting und Redaktion Claus Herwig * Barer Straße 70 * 80799 München +49 89 27826981 * Fax 27826982 * c.herwig@checon.de Closes: #579702 [ whitespace cleanups -maks ] Signed-off-by: maximilian attems <maks@debian.org>
2010-05-28hook-functions: re-add hid-microsoftmaximilian attems
people use it and thus complain.. Closes: 577253 Signed-off-by: maximilian attems <maks@debian.org>
2010-05-19initramfs-tools: change license to GPLmaximilian attems
The public domain "license" is very liberal and thus allows this to be relicensed under mostly any compatible license. Although not strictly needed many passed contributors agreed on the license change. Many especially asked for the "or any later version", thus it is now licensed under GPL v2 or later. This should ease collaboration with dracut. Acked-by: Jeff Bailey <jbailey@raspberryginger.com> Acked-by: Kees Cook <kees@outflux.net> Acked-by: Matt Kraai <kraai@ftbfs.org> Acked-by: Michal Pokrywka <mpokrywka@hoga.pl> Acked-by: martin f krafft <madduck@madduck.net> Acked-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Andres Salomon <dilinger@queued.net> Acked-by: Loïc Minier <lool@dooz.org> Acked-by: Chris Lamb <chris@chris-lamb.co.uk> Acked-by: Michael Prokop <mika@grml.org> Acked-by: Ferenc Wagner <wferi@niif.hu> Acked-by: Avi Rozen <avi.rozen@gmail.com> Acked-by: Piotr Lewandowski <piotr.lewandowski@gmail.com> Acked-by: Daniel Reichelt <debian@itamservices.de> Acked-by: Colin Watson <cjwatson@ubuntu.com> Acked-by: Fabio M. Di Nitto <fabbione@fabbione.net> Acked-by: Axel Beckert <abe@deuxchevaux.org> Acked-by: debian@x.ray.net Acked-by: Maik Zumstrull <maik@zumstrull.net> Acked-by: David Härdeman <david@hardeman.nu> Acked-by: Martin Michlmayr <tbm@cyrius.com> Acked-by: Ben Collins <bcollins@ubuntu.com> Acked-by: Glennie Vignarajah <glennie@glennie.fr> Acked-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: Aaron M. Ucko <amu@alum.mit.edu> Acked-by: kel@otaku42.de Acked-by: Maximilian Gass <mxey@ghosthacking.net> Acked-by: Joey Hess <joey@kitenet.net> Acked-by: Gerfried Fuchs <rhonda@deb.at> Acked-by: Tormod Volden <debian.tormod@gmail.com>