diff options
| author | maximilian attems <maks@debian.org> | 2006-02-27 00:20:17 +0100 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-02-27 00:20:17 +0100 |
| commit | 830fd3fa51658cf0398cbb037a8485439ae4ce2d (patch) | |
| tree | 7f074e4f4d39f782def3c1ea14106339a16f3ff2 /scripts | |
| parent | a563d25cc42346ba18a43c2a37896316c245d922 (diff) | |
| download | initramfs-tools-830fd3fa51658cf0398cbb037a8485439ae4ce2d.tar.gz initramfs-tools-830fd3fa51658cf0398cbb037a8485439ae4ce2d.zip | |
sync with ubuntu22 + some handmerges
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 9 | ||||
| -rwxr-xr-x | scripts/init-premount/thermal | 1 | ||||
| -rw-r--r-- | scripts/nfs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions index c550123..6825519 100644 --- a/scripts/functions +++ b/scripts/functions @@ -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" diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal index a41f6f3..d59af8a 100755 --- a/scripts/init-premount/thermal +++ b/scripts/init-premount/thermal @@ -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) diff --git a/scripts/nfs b/scripts/nfs index a2f6c3e..89b5c20 100644 --- a/scripts/nfs +++ b/scripts/nfs @@ -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 |