mirror of
https://salsa.debian.org/kernel-team/initramfs-tools.git
synced 2026-01-26 15:39:08 +00:00
sync with ubuntu22 + some handmerges
This commit is contained in:
maximilian attems
parent
a563d25cc4
commit
830fd3fa51
@ -4,12 +4,14 @@
|
||||
#
|
||||
|
||||
#
|
||||
# MODULES: [ most | dep | list ]
|
||||
# MODULES: [ most | netboot | dep | list ]
|
||||
#
|
||||
# most - Add all framebuffer, acpi, filesystem, and harddrive drivers.
|
||||
#
|
||||
# dep - Try and guess which modules to load.
|
||||
#
|
||||
# netboot - Add the base modules, network modules, but skip block devices.
|
||||
#
|
||||
# list - Only include modules from the 'additional modules' list
|
||||
#
|
||||
|
||||
|
||||
63
debian/changelog
vendored
63
debian/changelog
vendored
@ -1,10 +1,20 @@
|
||||
initramfs-tools (0.52c) unstable; urgency=high
|
||||
initramfs-tools (0.53) unstable; urgency=high
|
||||
|
||||
* update-initramfs: set_current_version needs to check against
|
||||
/boot/initrd-`uname -r` and not /boot/vmlinu?-`uname -r`.
|
||||
/boot/initrd-`uname -r` and not /boot/vmlinu?-`uname -r`.
|
||||
Otherwise this builds initramfs for newer handbuild trees too.
|
||||
|
||||
-- maximilian attems <maks@sternwelten.at> Mon, 20 Feb 2006 15:46:54 +0100
|
||||
* Resync with 0.40ubuntu22:
|
||||
- mptspi already included
|
||||
- keep nfsmount for now, we don't want to add further busybox deps.
|
||||
* Further reduce ubuntudiff:
|
||||
- scripts/functions: remove duplicate dir check.
|
||||
- scripts/nfs: add quiet to modules loading.
|
||||
|
||||
* Add kernel-package compat stuff, behaves like mkinitramfs,
|
||||
but adds the sha1sum for update-initramfs.
|
||||
|
||||
-- maximilian attems <maks@sternwelten.at> Thu, 23 Feb 2006 16:59:56 +0100
|
||||
|
||||
initramfs-tools (0.52b) unstable; urgency=high
|
||||
|
||||
@ -155,6 +165,53 @@ initramfs-tools (0.42) unstable; urgency=low
|
||||
even if bootloader setting is preferred.
|
||||
|
||||
-- maximilian attems <maks@sternwelten.at> Mon, 5 Dec 2005 12:59:59 +0100
|
||||
initramfs-tools (0.40ubuntu22) dapper; urgency=low
|
||||
|
||||
* Add mptspi to the list of SCSI modules put in the initramfs by default,
|
||||
which is required for some LSI Logic controllers and for the VMware SCSI
|
||||
controller in recent VMware versions (See launchpad.net/{27187,31229})
|
||||
* Fix typo of /dev/disk/by-*, which I wrote as /dev/disks/by-{uuid,label}
|
||||
* Load i2c-keywest before loading therm_pm72 in the PowerPC thermal hook,
|
||||
since the latter sometimes needs the former (Closes launchpad.net/27269)
|
||||
|
||||
-- Adam Conrad <adconrad@ubuntu.com> Tue, 14 Feb 2006 23:28:35 +1100
|
||||
|
||||
initramfs-tools (0.40ubuntu21) dapper; urgency=low
|
||||
|
||||
* Don't update the progress bar once udev has taken /dev away;
|
||||
after all, we can't contact usplash anyway at this point.
|
||||
|
||||
-- Scott James Remnant <scott@ubuntu.com> Wed, 8 Feb 2006 14:34:10 +0000
|
||||
|
||||
initramfs-tools (0.40ubuntu20) dapper; urgency=low
|
||||
|
||||
* Add ... to end of strings to match main boot sequence.
|
||||
|
||||
-- Scott James Remnant <scott@ubuntu.com> Tue, 7 Feb 2006 11:07:50 +0000
|
||||
|
||||
initramfs-tools (0.40ubuntu19) dapper; urgency=low
|
||||
|
||||
* Change the first of many "Loading modules" to "Loading essential drivers"
|
||||
to improve debugging when people say it breaks at that stage.
|
||||
|
||||
-- Scott James Remnant <scott@ubuntu.com> Tue, 7 Feb 2006 11:05:15 +0000
|
||||
|
||||
initramfs-tools (0.40ubuntu18) dapper; urgency=low
|
||||
|
||||
* Add support for selecting root by UUID or LABEL with syntax such as:
|
||||
root=LABEL=myrootfs or root=UUID=92addf34-0f02-4a0e-bfb2-cbaa1e907b77
|
||||
|
||||
-- Adam Conrad <adconrad@ubuntu.com> Fri, 3 Feb 2006 15:55:01 +0000
|
||||
|
||||
initramfs-tools (0.40ubuntu17) dapper; urgency=low
|
||||
|
||||
* Make auto_add_modules take an argument, so you can use it to add only
|
||||
some of the auto* modules (like "net" or "ide"), and create a "netboot"
|
||||
option that only includes base and net (Closes launchpad.net/26426)
|
||||
* Change the nfs script to use "mount -o nolock" instead of "nfsmount",
|
||||
to fix some timeouts for ltsp NFS roots (Closes launchpad.net/19196)
|
||||
|
||||
-- Adam Conrad <adconrad@ubuntu.com> Tue, 31 Jan 2006 11:55:11 +0000
|
||||
|
||||
initramfs-tools (0.40ubuntu16) dapper; urgency=low
|
||||
|
||||
|
||||
@ -136,31 +136,40 @@ dep_add_modules()
|
||||
# Modules that we always add to the initramfs
|
||||
auto_add_modules()
|
||||
{
|
||||
# base
|
||||
for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet atkbd i8042; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
|
||||
# Ethernet
|
||||
for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx dl2k e1000 e100 epic100 eql fealnx famachi forcedeth hp100 mace mv643xx_eth natsemi ne2k-pci netconsole ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire sundance sungem sungem_phy sunhme tg3 tlan de2104x de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb typhon via-rhine via-velocity yellowfin; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
|
||||
# ide
|
||||
for x in ide-cd ide-disk ide-generic aec62xx alim15x3 amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 generic hpt34x hpt366 ns87415 opti621 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks siimage sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
|
||||
# scsi
|
||||
for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptscsih mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
|
||||
# i2o
|
||||
for x in i2o_block; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
|
||||
case "$1" in
|
||||
base)
|
||||
for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet atkbd i8042; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
;;
|
||||
net)
|
||||
for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx dl2k e1000 e100 epic100 eql fealnx famachi forcedeth hp100 mace mv643xx_eth natsemi ne2k-pci netconsole ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire sundance sungem sungem_phy sunhme tg3 tlan de2104x de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb typhon via-rhine via-velocity yellowfin; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
;;
|
||||
ide)
|
||||
for x in ide-cd ide-disk ide-generic aec62xx alim15x3 amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 generic hpt34x hpt366 ns87415 opti621 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks siimage sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
;;
|
||||
scsi)
|
||||
for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptscsih mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
;;
|
||||
i2o)
|
||||
for x in i2o_block; do
|
||||
manual_add_modules "${x}"
|
||||
done
|
||||
;;
|
||||
*)
|
||||
auto_add_modules base
|
||||
auto_add_modules net
|
||||
auto_add_modules ide
|
||||
auto_add_modules scsi
|
||||
auto_add_modules i2o
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
usage()
|
||||
|
||||
12
init
12
init
@ -41,6 +41,14 @@ for x in $(cat /proc/cmdline); do
|
||||
;;
|
||||
root=*)
|
||||
ROOT=${x#root=}
|
||||
case $ROOT in
|
||||
LABEL=*)
|
||||
ROOT="/dev/disk/by-label/${ROOT#LABEL=}"
|
||||
;;
|
||||
UUID=*)
|
||||
ROOT="/dev/disk/by-uuid/${ROOT#UUID=}"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
nfsroot=*)
|
||||
NFSROOT=${x#nfsroot=}
|
||||
@ -84,7 +92,7 @@ run_scripts /scripts/init-top
|
||||
parse_numeric ${ROOT}
|
||||
|
||||
maybe_break modules
|
||||
log_begin_msg "Loading modules"
|
||||
log_begin_msg "Loading essential drivers..."
|
||||
load_modules
|
||||
log_end_msg
|
||||
|
||||
@ -94,7 +102,7 @@ run_scripts /scripts/init-premount
|
||||
log_end_msg
|
||||
|
||||
maybe_break mount
|
||||
log_begin_msg "Mounting root file system"
|
||||
log_begin_msg "Mounting root file system..."
|
||||
mountroot
|
||||
log_end_msg
|
||||
|
||||
|
||||
@ -22,6 +22,8 @@ The default setting is \fImost\fP.
|
||||
|
||||
\fIdep\fP tries to guess which modules are necessary for the running box.
|
||||
|
||||
\fInetboot\fP adds the base modules, network modules, but skips block devices.
|
||||
|
||||
\fIlist\fP includes only modules from the additional modules list.
|
||||
|
||||
.TP
|
||||
|
||||
@ -158,6 +158,11 @@ if [ "${MODULES}" = "most" ]; then
|
||||
auto_add_modules
|
||||
fi
|
||||
|
||||
if [ "${MODULES}" = "netboot" ]; then
|
||||
auto_add_modules base
|
||||
auto_add_modules net
|
||||
fi
|
||||
|
||||
# Have to do each file, because cpio --dereference doesn't recurse down
|
||||
# symlinks.
|
||||
|
||||
|
||||
@ -40,15 +40,14 @@ log_end_msg()
|
||||
|
||||
update_progress()
|
||||
{
|
||||
[ -d /dev/.initramfs ] || return
|
||||
|
||||
if [ -z "$PROGRESS_STATE" ]; then
|
||||
export PROGRESS_STATE=0
|
||||
fi
|
||||
|
||||
if [ -d /dev/.initramfs ]; then
|
||||
PROGRESS_STATE=$(($PROGRESS_STATE + 1))
|
||||
echo "PROGRESS_STATE=${PROGRESS_STATE}" \
|
||||
> /dev/.initramfs/progress_state
|
||||
fi
|
||||
PROGRESS_STATE=$(($PROGRESS_STATE + 1))
|
||||
echo "PROGRESS_STATE=${PROGRESS_STATE}" > /dev/.initramfs/progress_state
|
||||
|
||||
if [ -x /sbin/usplash_write ]; then
|
||||
/sbin/usplash_write "PROGRESS $PROGRESS_STATE"
|
||||
|
||||
@ -18,6 +18,7 @@ esac
|
||||
case "$DPKG_ARCH" in
|
||||
# load the right modules
|
||||
powerpc|ppc64)
|
||||
modprobe -q i2c-keywest
|
||||
modprobe -q therm_pm72
|
||||
;;
|
||||
i386|amd64|ia64)
|
||||
|
||||
@ -9,9 +9,9 @@ mountroot ()
|
||||
run_scripts /scripts/nfs-top
|
||||
[ "$quiet" != "y" ] && log_end_msg
|
||||
|
||||
modprobe nfs
|
||||
modprobe -q nfs
|
||||
# For DHCP
|
||||
modprobe af_packet
|
||||
modprobe -q af_packet
|
||||
|
||||
ipconfig ${DEVICE}
|
||||
. /tmp/net-${DEVICE}.conf
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user