Ignore:
Timestamp:
04/15/07 07:54:17 (7 years ago)
Author:
alanbach-guest
Message:

initramfs-tools updates

Location:
pkg/main/initramfs-tools/trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • pkg/main/initramfs-tools/trunk/debian/changelog

    r289 r905  
    1 initramfs-tools (0.85f.parsix1) unstable; urgency=high 
    2  
    3   * Parsix build with suspend2 support 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Wed, 14 Mar 2007 15:04:24 +0330 
     1initramfs-tools (0.86.parsix1) barry; urgency=low 
     2 
     3  * Parsix build, suspend2 support 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Sun, 15 Apr 2007 09:20:24 +0330 
     6 
     7initramfs-tools (0.86) unstable; urgency=low 
     8 
     9  * update-initramfs: Bound the mode and version variable. (closes: 403905) 
     10 
     11  * init: Set once the MODPROBE_OPTIONS environment variable and export it. 
     12    Don't forget to set -b to have the modprobe.d blacklists respected. 
     13    Thus remove everywhere the -q modprobe switch. 
     14    Thanks Ben Collins <bcollins@ubuntu.com> for the suggestion. 
     15 
     16  * small trailing whitespace cleanup, display full path of kernel-img.conf 
     17    in bug script. 
     18 
     19  * debian/control: Add busybox-initramfs as Ubuntu busybox alternative 
     20    to depends. Drop the sarge busybox-cvs-static entry. 
     21 
     22  * scripts/local-top/mdrun: Drop, existed for partial upgrades from sarge. 
     23 
     24  * scripts/local: Improve panic message and printed order. (closes: 414640) 
     25    Thanks Vincent.McIntyre@csiro.au for patch. 
     26 
     27  * scripts/functions: Check if panic is set before using it. (closes: 406107) 
     28    Thanks martin f krafft <madduck@debian.org> for report. 
     29 
     30  * hook-functions: Copy all kernel/drivers/{block,ide,scsi} subdir modules 
     31    instead of hardcoding the list of "supported" drivers. As consequence 
     32    the initramfs might be larger, but none of those should be missed! 
     33    As bonus syncs with Ubuntu. 
     34 
     35  * init: Mount /sys and /proc nodev, noexec, nosuid - Ubuntu sync. 
     36 
     37  * update-initramfs: If update-initramfs fails, restore the backup. 
     38    Useful if a MINKVER set is not fulfilled. (LP: #101844) 
     39    Thanks Soren Hansen <sh@linux2go.dk> for patch. 
     40 
     41  * initramfs-tools.preinst: Test if $RESUME is nonzero, not if it exists, 
     42    fixes issue of UUID resume dev. (LP: #67932) While there remove the 
     43    conffile mv handling of 0.61. 
     44 
     45  * scripts/functions: set_initlist() needs to add only script names with 
     46    alphabetics, numerics and underscores - skip any other. Bad enough 
     47    backup scripts get added, but they shouldn't lead to a panic. Also skip 
     48    directories that might lay around.  (closes: 398347) (LP: #76131) 
     49 
     50  * initramfs-tools.8: Document valid script names. 
     51 
     52  * mkinitramfs: Don't add backup scripts to initramfs. (closes: 378682) 
     53    (LP: #78348) 
     54 
     55  * scripts/functions: run_scripts() return immediately if passed dir 
     56    does not exist. Empty dirs without boot script aren't created anymore. 
     57 
     58  * debian/copyright: Update my email, add Ben Collins, update years, 
     59    alphabetic authors sort + add new git tree location. 
     60 
     61  * mkinitramfs: Set PATH with /sbin to allow non-root user usage. 
     62    Thanks Bob Montgomery <bob.montgomery@hp.com> for the suggestion. 
     63    (closes: 409995) 
     64 
     65 -- maximilian attems <maks@debian.org>  Tue, 10 Apr 2007 21:45:36 +0200 
     66 
     67initramfs-tools (0.85g) unstable; urgency=high 
     68 
     69  * SECURITY scripts/functions: Set permission of created root dev in 
     70    parse_numeric() to 600. This bug only affects lilo boots. Thanks 
     71    Fabian Pietsch <fabian@canvon.dyndns.org> and Goswin von Brederlow 
     72    <brederlo@informatik.uni-tuebingen.de> for patch input. (closes: 417995) 
     73 
     74  * debian/control: Change Uploaders email. 
     75 
     76 -- maximilian attems <maks@debian.org>  Fri,  6 Apr 2007 09:19:13 +0200 
    677 
    778initramfs-tools (0.85f) unstable; urgency=high 
     
    103174 
    104175  * scripts/init-top/framebuffer: Fix regression of /dev/fb0 creation, 
    105     modprobe fb before creating device. Thanks to Otavio Salvador  
     176    modprobe fb before creating device. Thanks to Otavio Salvador 
    106177    <otavio@debian.org> for patch. 
    107178 
     
    122193    Olli Helenius <olli@starnet.fi> 
    123194 
    124   * init-top/framebuffer: Fix duplicate fbno0 device creation. Merge the  
     195  * init-top/framebuffer: Fix duplicate fbno0 device creation. Merge the 
    125196    0.69ubuntu10 solution. Thanks Benjamin Leipold <rabbit171@web.de> 
    126197    for the report. (closes: 393890) 
  • pkg/main/initramfs-tools/trunk/debian/control

    r289 r905  
    22Section: utils 
    33Priority: optional 
    4 Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@sternwelten.at> 
     4Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@debian.org> 
    55Maintainer: Debian kernel team <debian-kernel@lists.debian.org> 
    66Build-Depends: debhelper (>= 4.1.0), cdbs 
     
    99Package: initramfs-tools 
    1010Architecture: all 
    11 Depends: klibc-utils (>= 1.4.19-2), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1) 
     11Depends: klibc-utils (>= 1.4.19-2), busybox (>= 1:1.01-3) | busybox-initramfs, cpio, module-init-tools, udev (>= 0.086-1) 
    1212Provides: linux-initramfs-tool 
    1313Description: tools for generating an initramfs 
  • pkg/main/initramfs-tools/trunk/debian/copyright

    r289 r905  
    22Thu, 27 Jan 2005 15:23:52 -0500. 
    33 
    4 The current Debian maintainer is maximilian attems <maks@sternwelten.at> 
     4The current Debian maintainer is maximilian attems <maks@debian.org> 
    55 
    66The source code up to 0.31 can be found by using "bzr" at: 
     
    1010http://archive.ubuntu.com/ubuntu/pool/main/i/initramfs-tools/ 
    1111 
    12 The Debian tree is maintained with "bzr" at: 
    13 http://bzr.debian.org/kernel/initramfs-tools/ 
     12The Debian tree is maintained with "git" at: 
     13git://git.debian.org/git/kernel/initramfs-tools.git 
     14http://git.debian.org/?p=kernel/initramfs-tools.git;a=shortlog 
    1415 
    15 Authors: Jeff Bailey <jbailey@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>, 
     16Authors: Adam Conrad <adconrad@ubuntu.com>, 
     17         Ben Collins <bcollins@ubuntu.com>, 
     18         Jeff Bailey <jbailey@ubuntu.com>,  
     19         maximilian attems <maks@debian.org> 
    1620         Scott James Remnant <scott@ubuntu.com>, 
    17          maximilian attems <maks@sternwelten.at> 
    1821 
    19 Copyright: 2005 Jeff Bailey 
    20            2005 - 2006 Adam Conrad 
     22Copyright: 2005 - 2006 Adam Conrad 
     23           2006 Ben Collins 
     24           2005 Jeff Bailey 
     25           2005 - 2007 maximilian attems 
    2126           2005 - 2006 Scott James Remnant 
    22            2005 - 2006 maximilian attems 
    2327 
    2428License: 
  • pkg/main/initramfs-tools/trunk/debian/initramfs-tools.preinst

    r289 r905  
    1616                         . /etc/mkinitrd/mkinitrd.conf 
    1717                fi 
    18                 if [ -e ${RESUME} ]; then 
     18                if [ -n "${RESUME}" ]; then 
    1919                        echo "RESUME=${RESUME}" > /etc/initramfs-tools/conf.d/resume 
    2020                fi 
     
    4141                fi 
    4242        ;; 
    43         upgrade) 
    44         if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.61"; then 
    45                 if [ -d /etc/initramfs-tools ]; then 
    46                         echo 
    47                         echo "Warning: /etc/initramfs-tools already exists." 
    48                         echo "         Please remove it for upgrade." 
    49                         echo 
    50                         exit 1 
    51                 fi 
    52                 if [ -d /etc/mkinitramfs ]; then 
    53                         mv /etc/mkinitramfs /etc/initramfs-tools 
    54                 fi 
    55         fi 
    56         ;; 
    5743esac 
    5844 
  • pkg/main/initramfs-tools/trunk/debian/script

    r289 r905  
    1616 
    1717if [ -r /etc/kernel-img.conf ]; then 
    18         echo "-- kernel-img.conf" 
     18        echo "-- /etc/kernel-img.conf" 
    1919        cat /etc/kernel-img.conf 
    2020        echo 
  • pkg/main/initramfs-tools/trunk/hook-functions

    r289 r905  
    173173        ;; 
    174174        ide) 
    175                 for x in ide-cd ide-disk ide-generic aec62xx alim15x3 \ 
    176                 amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 \ 
    177                 generic hpt34x hpt366 it821x jmicron ns87415 opti621 \ 
    178                 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks \ 
    179                 siimage sis5513 slc82c105 slc90e66 triflex trm290 \ 
    180                 via82cxxx; do 
    181                         manual_add_modules "${x}" 
    182                 done 
     175                copy_modules_dir kernel/drivers/ide 
    183176        ;; 
    184177        scsi) 
    185                 for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \ 
    186                 aic79xx aic7xxx aic94xx arcmsr ata_piix atari_scsi \ 
    187                 atp870u BusLogic cciss ch cpqarray DAC960 dc395x \ 
    188                 dmx3191d dpt_i2o eata fdomain gdth hptiop ibmvscsic \ 
    189                 initio ipr ips isp1020 lasi700 lpfc max_scsi mac53c94 \ 
    190                 megaraid megaraid_mbox megaraid_mm megaraid_sas \ 
    191                 mesh mptfc mptscsih mptsas mptspi nsp32 \ 
    192                 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx \ 
    193                 qla4xxx qla6312 qlogicfas408 qlogicfc sata_mv sata_nv \ 
    194                 sata_promise sata_qstor sata_sil sata_sil24 sata_sis sata_svw \ 
    195                 sata_sx4 sata_uli sata_via sata_vsc scsi_mod \ 
    196                 scsi_transport_fc scsi_transport_iscsi scsi_transport_spi \ 
    197                 sd_mod stex sym53c8xx tmscsim zalon zfcp; do 
     178                copy_modules_dir kernel/drivers/scsi 
     179                for x in mptfc mptsas mptscsih mptspi; do 
    198180                        manual_add_modules "${x}" 
    199181                done 
     
    201183        ata) 
    202184                copy_modules_dir kernel/drivers/ata 
     185        ;; 
     186        block) 
     187                copy_modules_dir kernel/drivers/block 
    203188        ;; 
    204189        ieee1394) 
     
    222207                auto_add_modules ide 
    223208                auto_add_modules scsi 
     209                auto_add_modules block 
    224210                auto_add_modules ata 
    225211                auto_add_modules i2o 
  • pkg/main/initramfs-tools/trunk/init

    r289 r905  
    99[ -d /tmp ] || mkdir /tmp 
    1010mkdir -p /var/lock 
    11 mount -t sysfs none /sys 
    12 mount -t proc none /proc 
     11mount -t sysfs none /sys -o nodev,noexec,nosuid 
     12mount -t proc none /proc -o nodev,noexec,nosuid 
    1313 
    1414# Suspend2 resume fix 
     
    4040done 
    4141. /scripts/functions 
     42 
     43# Set modprobe env 
     44export MODPROBE_OPTIONS="-qb" 
    4245 
    4346# Export relevant variables 
  • pkg/main/initramfs-tools/trunk/initramfs-tools.8

    r289 r905  
    1 .TH INITRAMFS-TOOLS 8  "Date: 2006/10/14" "" "mkinitramfs script overview" 
     1.TH INITRAMFS-TOOLS 8  "Date: 2007/04/09" "" "mkinitramfs script overview" 
    22 
    33.SH NAME 
     
    1010frobnication of a lvm partition prior to mounting the root partition. 
    1111 
     12Valid boot and hook scripts names consist solely of alphabetics, numerics 
     13and underscores. Other scripts are discarded. 
     14 
    1215.SS Hook scripts 
    1316These are used when an initramfs image is created and not included in the 
     
    1821kernel boot in the early user-space before the root partition has been 
    1922mounted. 
    20  
    21 initramfs-tools uses shell variable names for handling dependencies. 
    22 Notice that `-' is not a valid shell variable name and thus should 
    23 not be used as script filename. 
    2423 
    2524.SH INIT SCRIPT 
  • pkg/main/initramfs-tools/trunk/mkinitramfs

    r289 r905  
    22 
    33umask 0022 
     4export PATH='/usr/bin:/sbin:/bin' 
    45 
    56# Defaults 
     
    200201 
    201202copy_exec /usr/share/initramfs-tools/init /init 
    202 cp -a /usr/share/initramfs-tools/scripts/* "${DESTDIR}/scripts" 
    203 for f in $(cd ${CONFDIR}/scripts && \ 
    204         find . \( -name '*.dpkg*' -prune -o -name '*~' -prune \) \ 
    205                 -o -type f -print); do 
    206         mkdir --parents "${DESTDIR}/scripts/$(dirname "${f}")" 
    207 cp -p "${CONFDIR}/scripts/${f}" "${DESTDIR}/scripts/$(dirname "${f}")" 
    208 done 
     203 
     204# add existant boot scripts 
     205for b in $(cd /usr/share/initramfs-tools/scripts/ && find . \ 
     206        -regex '.*/[a-z0-9_]+$' -type f); do 
     207        [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ 
     208                || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" 
     209        cp -p "/usr/share/initramfs-tools/scripts/${b}" \ 
     210                "${DESTDIR}/scripts/$(dirname "${b}")" 
     211done 
     212for b in $(cd "${CONFDIR}/scripts" && find . -regex '.*/[a-z0-9_]+$' -type f); do 
     213        [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ 
     214                || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" 
     215        cp -p "${CONFDIR}/scripts/${b}" "${DESTDIR}/scripts/$(dirname "${b}")" 
     216done 
     217 
    209218echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf 
    210219copy_exec "${CONFDIR}/initramfs.conf" /conf 
  • pkg/main/initramfs-tools/trunk/scripts/functions

    r289 r905  
    6161        fi 
    6262        # Disallow console access 
    63         if [ "${panic}" = 0 ]; then 
     63        if [ -n "${panic}" ] && [ "${panic}" = 0 ]; then 
    6464                reboot 
    6565        fi 
    66         modprobe -q i8042 
    67         modprobe -q atkbd 
     66        modprobe i8042 
     67        modprobe atkbd 
    6868        echo $@ 
    6969        PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1 
     
    8686        unset initlist 
    8787        for si_x in ${initdir}/*; do 
     88                # only allow variable name chars 
     89                case ${si_x#${initdir}/} in 
     90                *[!A-Za-z0-9_]*) 
     91                        continue 
     92                        ;; 
     93                esac 
     94                # skip non executable scripts 
    8895                if [ ! -x ${si_x} ]; then 
     96                        continue 
     97                fi 
     98                # skip directories 
     99                if [ -d ${si_x} ]; then 
    89100                        continue 
    90101                fi 
     
    188199{ 
    189200        initdir=${1} 
     201        [ ! -d ${initdir} ] && return 
    190202        get_prereqs 
    191203        reduce_prereqs 
     
    207219                                continue 
    208220                        fi 
    209                         modprobe -q $m 
     221                        modprobe $m 
    210222                done 
    211223        fi 
     
    233245 
    234246        mknod /dev/root b ${major} ${minor} 
     247        chmod 600 /dev/root 
    235248        ROOT=/dev/root 
    236249} 
  • pkg/main/initramfs-tools/trunk/scripts/init-premount/thermal

    r289 r905  
    1919# load the right modules 
    2020powerpc|ppc64) 
    21         modprobe -q i2c-powermac 
    22         modprobe -q therm_pm72 
    23         modprobe -q windfarm_cpufreq_clamp 
    24         modprobe -q windfarm_lm75_sensor 
    25         modprobe -q windfarm_max6690_sensor 
    26         modprobe -q windfarm_pm112 
    27         modprobe -q windfarm_pm81 
    28         modprobe -q windfarm_pm91 
    29         modprobe -q windfarm_smu_controls 
    30         modprobe -q windfarm_smu_sat 
    31         modprobe -q windfarm_smu_sensors 
     21        modprobe i2c-powermac 
     22        modprobe therm_pm72 
     23        modprobe windfarm_cpufreq_clamp 
     24        modprobe windfarm_lm75_sensor 
     25        modprobe windfarm_max6690_sensor 
     26        modprobe windfarm_pm112 
     27        modprobe windfarm_pm81 
     28        modprobe windfarm_pm91 
     29        modprobe windfarm_smu_controls 
     30        modprobe windfarm_smu_sat 
     31        modprobe windfarm_smu_sensors 
    3232        ;; 
    3333i386|amd64|ia64) 
    34         modprobe -q fan 
    35         modprobe -q thermal 
     34        modprobe fan 
     35        modprobe thermal 
    3636        ;; 
    3737esac 
  • pkg/main/initramfs-tools/trunk/scripts/init-top/framebuffer

    r289 r905  
    8787 
    8888if [ -n "${FB}" ]; then 
    89         modprobe -q fbcon 
    90         modprobe -q ${FB} ${OPTS} 
     89        modprobe fbcon 
     90        modprobe ${FB} ${OPTS} 
    9191fi 
    9292 
  • pkg/main/initramfs-tools/trunk/scripts/local

    r289 r905  
    4141        # We've given up, but we'll let the user fix matters if they can 
    4242        while [ ! -e "${ROOT}" ]; do 
    43                 echo "  Check root= bootarg cat /proc/cmdline" 
    44                 echo "  or missing modules, devices: cat /proc/modules ls /dev" 
    45                 panic "ALERT!  ${ROOT} does not exist.  Dropping to a shell!" 
     43                echo "ALERT!  ${ROOT} does not exist.  Dropping to a shell!" 
     44                echo "  Check your root= boot argument (cat /proc/cmdline)" 
     45                panic " Check for missing modules (cat /proc/modules), or device files (ls /dev)" 
    4646        done 
    4747 
     
    6868 
    6969        # FIXME This has no error checking 
    70         modprobe -q ${FSTYPE} 
     70        modprobe ${FSTYPE} 
    7171 
    7272        # FIXME This has no error checking 
  • pkg/main/initramfs-tools/trunk/scripts/local-top/lvm

    r289 r905  
    6565fi 
    6666 
    67 modprobe -q dm-mod 
    68 modprobe -q dm-snapshot 
    69 modprobe -q dm-mirror 
     67modprobe dm-mod 
     68modprobe dm-snapshot 
     69modprobe dm-mirror 
    7070 
    7171activate_vg "$ROOT" 
  • pkg/main/initramfs-tools/trunk/scripts/local-top/udev_helper

    r289 r905  
    2020# we need to load ide-generic. 
    2121if [ ! -e "${ROOT}" -o "${ROOT}" = "/dev/root" ]; then 
    22         modprobe -q ide-generic 
     22        modprobe ide-generic 
    2323fi 
  • pkg/main/initramfs-tools/trunk/scripts/nfs

    r289 r905  
    7979        [ "$quiet" != "y" ] && log_end_msg 
    8080 
    81         modprobe -q nfs 
     81        modprobe nfs 
    8282        # For DHCP 
    83         modprobe -q af_packet 
     83        modprobe af_packet 
    8484 
    8585        # Default delay is around 180s 
  • pkg/main/initramfs-tools/trunk/update-initramfs

    r289 r905  
    55CONF=/etc/initramfs-tools/update-initramfs.conf 
    66KPKGCONF=/etc/kernel-img.conf 
     7mode="" 
     8version="" 
    79 
    810set -e 
     
    112114} 
    113115 
     116# restore initramfs backup 
     117restore_initramfs() 
     118{ 
     119        [ -z "${initramfs_bak}" ] && return 0 
     120        verbose "Restoring ${initramfs_bak}" 
     121        mv -f "${initramfs_bak}" "${initramfs}" 
     122} 
     123 
     124 
    114125generate_initramfs() 
    115126{ 
     
    123134        else 
    124135                mkinitramfs_return="$?" 
     136                restore_initramfs 
    125137                if [ "$mkinitramfs_return" = "2" ]; then 
    126138                        # minversion wasn't met, exit 0 
  • pkg/main/initramfs-tools/trunk/update-initramfs.conf.5

    r289 r905  
    1 .TH UPDATE-INITRAMFS.CONF 5  "$Date: 2006/10/12 $" "" "update-initramfs.conf manual" 
     1.TH UPDATE-INITRAMFS.CONF 5  "$Date: 2006/12/22 $" "" "update-initramfs.conf manual" 
    22 
    33.SH NAME 
     
    1414newest Linux image. 
    1515It is possible to set it to \fIno\fP for remote servers or boxes where 
    16 conservative manners needs to be applied. This disables  
     16conservative manners needs to be applied. This disables 
    1717the \fBupdate_initramfs -u\fP call. 
    1818 
Note: See TracChangeset for help on using the changeset viewer.