diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-05-24 23:37:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-05-24 23:37:24 -0700 |
| commit | 8583974f03ee95fdb6d3fa0586ed49aaaebf584b (patch) | |
| tree | f548dc1c3e356e184411e59b8074668af337e9a1 /Documentation | |
| parent | 3a8a4221462b181a8fda956c5835f1ae1b212684 (diff) | |
| parent | 51f17423ad91e33031147336330fa2e5d34e803d (diff) | |
| download | history-8583974f03ee95fdb6d3fa0586ed49aaaebf584b.tar.gz | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/BK-usage/bk-kernel-howto.txt | 2 | ||||
| -rwxr-xr-x | Documentation/BK-usage/gcapatch | 2 | ||||
| -rw-r--r-- | Documentation/laptop-mode.txt | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/BK-usage/bk-kernel-howto.txt b/Documentation/BK-usage/bk-kernel-howto.txt index 8e10090355b121..b7b9075d291083 100644 --- a/Documentation/BK-usage/bk-kernel-howto.txt +++ b/Documentation/BK-usage/bk-kernel-howto.txt @@ -279,5 +279,5 @@ specific state of the tree). for my long-lived kernel branch? A. Yes. This requires BK 3.x, though. - bk export -tpatch -r`bk repogca http://linux.bkbits.net/linux-2.5`,+ + bk export -tpatch -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ diff --git a/Documentation/BK-usage/gcapatch b/Documentation/BK-usage/gcapatch index 9969906e8ad7bc..aaeb17dc7c7f29 100755 --- a/Documentation/BK-usage/gcapatch +++ b/Documentation/BK-usage/gcapatch @@ -5,4 +5,4 @@ # Usage: gcapatch > foo.patch # -bk export -tpatch -hdu -r`bk repogca http://linux.bkbits.net/linux-2.5`,+ +bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt index 66824e9d7480a8..423ecefb7bc147 100644 --- a/Documentation/laptop-mode.txt +++ b/Documentation/laptop-mode.txt @@ -279,7 +279,13 @@ parse_mount_opts_wfstab () { fi } -KLEVEL="$(uname -r | cut -c1-3)" +KLEVEL=$( + uname -r | + ( + IFS="." read a b c + echo $a.$b + ) + ) case "$KLEVEL" in "2.4"|"2.6") true @@ -496,7 +502,7 @@ status=`awk '/^state: / { print $2 }' /proc/acpi/ac_adapter/AC/state` case $status in "on-line") - echo "Setting HD spindown to 2 hours" + echo "Setting HD spindown for AC mode." /sbin/laptop_mode stop /sbin/hdparm -S $ACAD_HD /dev/hda > /dev/null 2>&1 /sbin/hdparm -B 255 /dev/hda > /dev/null 2>&1 @@ -504,7 +510,7 @@ case $status in exit 0 ;; "off-line") - echo "Setting HD spindown to 20 seconds" + echo "Setting HD spindown for battery mode." /sbin/laptop_mode start /sbin/hdparm -S $BATT_HD /dev/hda > /dev/null 2>&1 /sbin/hdparm -B 1 /dev/hda > /dev/null 2>&1 |