Changeset 1277


Ignore:
Timestamp:
05/16/07 06:09:24 (6 years ago)
Author:
alanbach-guest
Message:

initramfs-tools 0.87b updates

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

Legend:

Unmodified
Added
Removed

  • pkg/main/initramfs-tools/trunk/conf/initramfs.conf

    r289 r1277  
    1818MODULES=most 
    1919 
     20# 
    2021# BUSYBOX: [ y | n ] 
    2122# 
    … …  
    2425 
    2526BUSYBOX=y 
     27 
     28# 
     29# KEYMAP: [ y | n ] 
     30# 
     31# Load a keymap during the initramfs stage. 
     32# 
     33 
     34KEYMAP=n 
    2635 
    2736# 

  • pkg/main/initramfs-tools/trunk/debian/TODO

    r289 r1277  
    1111 
    1212 o udevsettle timeouts handling 
    13  
    14  o lvm2 hooks to their respective packages 

  • pkg/main/initramfs-tools/trunk/debian/changelog

    r905 r1277  
    1 initramfs-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 
     1initramfs-tools (0.87b.parsix1) barry; urgency=low 
     2 
     3  * Parsix build, Suspend2 support 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Wed, 16 May 2007 07:38:25 +0330 
     6 
     7initramfs-tools (0.87b) unstable; urgency=low 
     8 
     9  * scripts/init-top/framebuffer: Remove vga16fb loading on splash bootarg. 
     10    Newer usplash > 0.4 no longer needs that. 
     11 
     12  * hooks/legacymdadm: remove only needed for partial upgrades from sarge. 
     13 
     14  *  hooks/legacylvm: Source relevant functions. (closes: 419667) 
     15 
     16 -- maximilian attems <maks@debian.org>  Tue, 17 Apr 2007 11:56:58 +0200 
     17 
     18initramfs-tools (0.87) unstable; urgency=low 
     19 
     20  [ maximilian attems ] 
     21  * scripts/functions: reduce_satisfied() needs to ignore the same set as 
     22    set_initlist() otherwise an script having a prereqs on a non-executable 
     23    boot script may cause circular panic. (closes: 418509) 
     24  * Add blacklist boot param, disabling the load of specific modules inside 
     25    the initramfs. Still needs to be passed via tmpfs to the rootfs. 
     26  * mkinitramfs, scripts/functions: Fix regexes to always use posix character 
     27    classes. Based on a patch by Meelis Roos <mroos@linux.ee>. 
     28    (closes: 419062) 
     29 
     30  [ David HÀrdeman ] 
     31  * Add support for loading keymaps. (closes: 337663) 
     32  * Move legacy code from mkinitramfs to separate hooks. 
     33  * Ubuntu merge 
     34    - Add PS3 module loading functionality without grep usage. 
     35  * debian/copyright: Update authors info. 
     36  * Bump standards version, no changes necessary. 
     37  * debian/scripts: Print settings from initramfs.conf in reportbug script. 
     38 
     39 -- maximilian attems <maks@debian.org>  Mon, 16 Apr 2007 20:21:30 +0200 
    640 
    741initramfs-tools (0.86) unstable; urgency=low 

  • pkg/main/initramfs-tools/trunk/debian/control

    r905 r1277  
    22Section: utils 
    33Priority: optional 
    4 Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@debian.org> 
     4Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@debian.org>, David HÀrdeman <david@hardeman.nu> 
    55Maintainer: Debian kernel team <debian-kernel@lists.debian.org> 
    66Build-Depends: debhelper (>= 4.1.0), cdbs 
    7 Standards-Version: 3.7.2.0 
     7Standards-Version: 3.7.2.2 
    88 
    99Package: initramfs-tools 

  • pkg/main/initramfs-tools/trunk/debian/copyright

    r905 r1277  
    1616Authors: Adam Conrad <adconrad@ubuntu.com>, 
    1717         Ben Collins <bcollins@ubuntu.com>, 
     18         David HÀrdeman <david@hardeman.nu>, 
    1819         Jeff Bailey <jbailey@ubuntu.com>,  
    19          maximilian attems <maks@debian.org> 
    20          Scott James Remnant <scott@ubuntu.com>, 
     20         maximilian attems <maks@debian.org>, 
     21         Scott James Remnant <scott@ubuntu.com> 
    2122 
    2223Copyright: 2005 - 2006 Adam Conrad 
    2324           2006 Ben Collins 
     25           2005 - 2007 David HÀrdeman 
    2426           2005 Jeff Bailey 
    2527           2005 - 2007 maximilian attems 

  • pkg/main/initramfs-tools/trunk/debian/script

    r905 r1277  
    2020        echo 
    2121fi 
     22 
     23if [ -r /etc/initramfs-tools/initramfs.conf ]; then 
     24        echo "-- /etc/initramfs-tools/initramfs.conf" 
     25        sed 's/#.*$//;/^[[:space:]]*$/d' /etc/initramfs-tools/initramfs.conf 
     26        echo 
     27fi 

  • pkg/main/initramfs-tools/trunk/hook-functions

    r905 r1277  
    147147                manual_add_modules i2o_block 
    148148        fi 
     149 
     150        if [ -e /sys/bus/ps3_system_bus/ ]; then 
     151                for x in ps3_storage gelic_net ohci-hcd ehci-hcd; do 
     152                        manual_add_modules "${x}" 
     153                done 
     154        fi 
    149155} 
    150156 
    … …  
    163169                for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx \ 
    164170                dl2k e1000 e100 ehea epic100 ep93xx_eth eql fealnx \ 
    165                 famachi forcedeth hp100 mace mv643xx_eth myri10ge \ 
     171                famachi forcedeth gelic_net hp100 mace mv643xx_eth myri10ge \ 
    166172                natsemi ne2k-pci netconsole ns83820 pcnet32 qla3xxx \ 
    167173                r8169 s2io sis900 skge slhc smc911x starfire \ 

  • pkg/main/initramfs-tools/trunk/init

    r905 r1277  
    5454export ROOTDELAY= 
    5555export panic= 
     56export blacklist= 
    5657 
    5758# Parse command line options 
    … …  
    129130                break=premount 
    130131                ;; 
     132        blacklist=*) 
     133                blacklist=${x#blacklist=} 
     134                ;; 
    131135        esac 
    132136done 

  • pkg/main/initramfs-tools/trunk/initramfs-tools.8

    r905 r1277  
    8989\fB \fI rw 
    9090mounts the rootfs read-write. 
     91 
     92.TP 
     93\fB \fI blacklist 
     94disables load of specific modules. 
     95Use blacklist=module1,module2,module3 bootparameter. 
    9196 
    9297.TP 
    … …  
    445450 
    446451.SH AUTHOR 
    447 The initramfs-tools are written by Maximilian Attems <maks@sternwelten.at>, 
     452The initramfs-tools are written by Maximilian Attems <maks@debian.org>, 
    448453Jeff Bailey <jbailey@raspberryginger.com> and numerous others. 
    449454.PP 
    450 This manual was written by David  H\[:a]rdeman <david@2gen.com>, 
    451 updated by Maximilian Attems <maks@sternwelten.at>. 
     455This manual was written by David  H\[:a]rdeman <david@hardeman.nu>, 
     456updated by Maximilian Attems <maks@debian.org>. 
    452457 
    453458.SH SEE ALSO 

  • pkg/main/initramfs-tools/trunk/initramfs.conf.5

    r289 r1277  
    4141Beware that many boot scripts need busybox utilities. 
    4242 
     43.TP 
     44\fB KEYMAP 
     45If set to 'y', the console keymap will be loaded during the initramfs stage. 
     46The keymap will anyway be loaded by the initscripts later, and the packages 
     47that might need input will normally set this variable automatically, so there 
     48should normally be no need to set this. 
     49 
    4350.SH NFS VARIABLES 
    4451.TP 
    … …  
    5966 
    6067.SH AUTHOR 
    61 The initramfs-tools are written by Maximilian Attems <maks@sternwelten.at>, 
     68The initramfs-tools are written by Maximilian Attems <maks@debian.org>, 
    6269Jeff Bailey <jbailey@raspberryginger.com> and numerous others. 
    6370Loosely based on mkinitrd.conf by Herbert Xu. 

  • pkg/main/initramfs-tools/trunk/mkinitramfs

    r905 r1277  
    8585EXTRA_CONF='' 
    8686for i in /usr/share/initramfs-tools/conf.d/* ${CONFDIR}/conf.d/*; do 
    87         EXTRA_CONF="${EXTRA_CONF} $(basename $i | grep '^[a-z0-9][a-z0-9\._-]*$' | grep -v '\.dpkg-.*$')"; 
     87        EXTRA_CONF="${EXTRA_CONF} $(basename $i \ 
     88                | grep '^[[:alnum:]][[:alnum:]\._-]*$' | grep -v '\.dpkg-.*$')"; 
    8889done 
    8990for i in ${EXTRA_CONF}; do 
    … …  
    164165export DPKG_ARCH 
    165166export verbose 
     167export KEYMAP 
    166168 
    167169# Private, used by 'catenate_cpiogz'. 
    … …  
    204206# add existant boot scripts 
    205207for b in $(cd /usr/share/initramfs-tools/scripts/ && find . \ 
    206         -regex '.*/[a-z0-9_]+$' -type f); do 
     208        -regextype posix-extended -regex '.*/[[:alnum:]_]+$' -type f); do 
    207209        [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ 
    208210                || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" 
    … …  
    210212                "${DESTDIR}/scripts/$(dirname "${b}")" 
    211213done 
    212 for b in $(cd "${CONFDIR}/scripts" && find . -regex '.*/[a-z0-9_]+$' -type f); do 
     214for b in $(cd "${CONFDIR}/scripts" && find . \ 
     215        -regextype posix-extended -regex '.*/[[:alnum:]_]+$' -type f); do 
    213216        [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ 
    214217                || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" 
    … …  
    252255run_scripts "${CONFDIR}"/hooks 
    253256 
    254 # FIXME: Remove this Raid block after Etch releases 
    255 if [ -x /sbin/mdadm ] && [ ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then 
    256         # use mkinitrd magic for Sarge backwards compat 
    257         rootraiddev="$(df / | sed -rne 's,^(/dev/[^[:space:]]+).*,\1,p')" 
    258         echo "rootraiddev=${rootraiddev}" > ${DESTDIR}/conf/mdrun.conf 
    259         mdadm=$(mdadm --detail "${rootraiddev}") 
    260         echo "${mdadm}" | awk ' 
    261                 $1 == "Number" && $2 == "Major" { start = 1; next } 
    262                 $1 == "UUID" { print "uuid=" $3; next } 
    263                 !start { next } 
    264                 $2 == 0 && $3 == 0 { next } 
    265                 { devices = devices " " $NF } 
    266                 END { print "devices='\''" devices "'\''" }' \ 
    267                 >> ${DESTDIR}/conf/mdrun.conf 
    268         copy_exec /sbin/mdadm /sbin 
    269         for x in md linear multipath raid0 raid1 raid456 raid5 raid6 raid10; do 
    270                 manual_add_modules ${x} 
    271         done 
    272 fi 
    273 [ -x /sbin/mdrun ] && copy_exec /sbin/mdrun /sbin 
    274  
    275 # FIXME: Remove this LVM block after Etch releases 
    276 if [ -x /sbin/vgchange ] && [ -d /lib/lvm-200 ] \ 
    277         && [ ! -f /usr/share/initramfs-tools/hooks/lvm2 ]; then 
    278         copy_exec /lib/lvm-200/vgchange /sbin 
    279         for x in dm_mod dm_snapshot dm_mirror; do 
    280                 manual_add_modules ${x} 
    281         done 
    282 fi 
    283  
    284257# Apply DSDT to initramfs 
    285258if [ -e "${CONFDIR}/DSDT.aml" ]; then 

  • pkg/main/initramfs-tools/trunk/mkinitramfs-kpkg.8

    r289 r1277  
    4444 
    4545.SH AUTHOR 
    46 mkinitramfs-kpkg is maintained by Maximilian Attems <maks@sternwelten.at>. 
     46mkinitramfs-kpkg is maintained by Maximilian Attems <maks@debian.org>. 
    4747 
    4848.SH SEE ALSO 

  • pkg/main/initramfs-tools/trunk/mkinitramfs.8

    r289 r1277  
    101101 
    102102.SH AUTHOR 
    103 The initramfs-tools are written by Maximilian Attems <maks@sternwelten.at>, 
     103The initramfs-tools are written by Maximilian Attems <maks@debian.org>, 
    104104Jeff Bailey <jbailey@raspberryginger.com> and numerous others. 
    105105 

  • pkg/main/initramfs-tools/trunk/scripts/functions

    r905 r1277  
    8888                # only allow variable name chars 
    8989                case ${si_x#${initdir}/} in 
    90                 *[!A-Za-z0-9_]*) 
     90                *[![:alnum:]_]*) 
    9191                        continue 
    9292                        ;; 
    … …  
    109109        unset tmpdeplist 
    110110        for rs_y in ${deplist}; do 
    111                 if [ ! -f ${initdir}/${rs_y} ]; then 
     111                # only allow variable name chars 
     112                case ${rs_y} in 
     113                *[![:alnum:]_]*) 
     114                        continue 
     115                        ;; 
     116                esac 
     117                # skip non executable scripts 
     118                if [ ! -x ${initdir}/${rs_y} ]; then 
     119                        continue 
     120                fi 
     121                # skip directories 
     122                if [ -d ${initdir}/${rs_y} ]; then 
    112123                        continue 
    113124                fi 

  • pkg/main/initramfs-tools/trunk/scripts/init-top/framebuffer

    r905 r1277  
    6262for x in $(cat /proc/cmdline); do 
    6363        case ${x} in 
    64         splash*) 
    65                 FB="vga16fb"; 
    66                 OPTS=""; 
    67                 ;; 
    6864        vga=*) 
    6965                FB="vesafb"; 

  • pkg/main/initramfs-tools/trunk/update-initramfs.8

    r289 r1277  
    8686 
    8787.SH AUTHOR 
    88 The initramfs-tools are written by Maximilian Attems <maks@sternwelten.at>, 
     88The initramfs-tools are written by Maximilian Attems <maks@debian.org>, 
    8989Jeff Bailey <jbailey@raspberryginger.com> and numerous others. 
    9090 

  • pkg/main/initramfs-tools/trunk/update-initramfs.conf.5

    r905 r1277  
    1818 
    1919.SH AUTHOR 
    20 The initramfs-tools are written by Maximilian Attems <maks@sternwelten.at>, 
     20The initramfs-tools are written by Maximilian Attems <maks@debian.org>, 
    2121Jeff Bailey <jbailey@raspberryginger.com> and numerous others. 
    2222.SH SEE ALSO 
Note: See TracChangeset for help on using the changeset viewer.