Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (dc9acbd6f6d1ed8daa58661af436951a298aff4d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (dc9acbd6f6d1ed8daa58661af436951a298aff4d)
  • Date: Wed, 17 Oct 2007 23:44:00 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/hdparm/DETAILS | 6 -
disk/hdparm/HISTORY | 7 +
disk/hdparm/init.d/hdparm | 13 ++-
disk/hdparm/init.d/hdparm.conf | 3
mobile/acpi-support/DETAILS | 3
mobile/acpi-support/HISTORY | 7 +
mobile/acpi-support/init.d/acpi-support | 3
mobile/acpi-support/init.d/vbesave | 4
mobile/laptop-mode-tools/DETAILS | 3
mobile/laptop-mode-tools/HISTORY | 14 +++
mobile/laptop-mode-tools/init.d/laptop-mode | 17 ----
mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch | 75
+++++++++++++++---
12 files changed, 112 insertions(+), 43 deletions(-)

New commits:
commit dc9acbd6f6d1ed8daa58661af436951a298aff4d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

laptop-mode-tools: Fix comparing integer to string

commit 93b3249bc271678c9fc84cc1695b463bfa1adb2e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

laptop-mode-tools: Don't look in /usr/local for modules

commit bf8d438fc86b4c0a5aa4789d1712a336bf2b3bfa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

laptop-mode-tools: Remove force-reload, causes bootup errors

commit 4f40c7e30c0e004e5ec08a46e1e847ba29f7c66d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

acpi-support: Change LICENSE -> LICENSE[0]

commit fe45b9434ac8586cc582710e2d071ec79d582ada
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

acpi-support: Remove force-reload(), it's causing errors doing boot

commit 956cf4375b507723d37ab3ab448ada62bc90e5d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hdparm: By default have init be quiet, just like our other scripts

commit f807f27a5321856bd49565c441e61f007f921cb5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hdparm: Check if the file exists before using it, print the starting tag
and the return value

commit d77dcf3a6e4925be0235b94a8fafeb895abc85ef
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

laptop-mode-tools: Cleanup strange characters in init script and cleanup
provided install script to not muck with services

diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index bf42090..71f4262 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -4,11 +4,11 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://sourceforge.net/projects/hdparm/
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=BSD
- ENTERED=20010922
+ WEB_SITE=http://sourceforge.net/projects/hdparm/
KEYWORDS="disk"
+ ENTERED=20010922
SHORT="A utility to access/tune Linux's EIDE drivers."
cat << EOF
hdparm is a shell utility to access/tune ioctl features of the Linux
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index bf10495..4500bc5 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,10 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Incremented PATCHLEVEL=2
+ * init.d/hdparm: Check if a directory exists before cating it
+ Print that we're starting hdparm and print the return value
+ * init.d/hdparm.conf: By default be quiet, just like the rest of our
+ scripts
+
2007-09-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++
* INSTALL: install_rootifying
diff --git a/disk/hdparm/init.d/hdparm b/disk/hdparm/init.d/hdparm
index 9dcc370..a7a35f2 100755
--- a/disk/hdparm/init.d/hdparm
+++ b/disk/hdparm/init.d/hdparm
@@ -9,6 +9,7 @@ RUNLEVEL=1

start()
{
+ echo "Starting hdparm..."
# SCSI/SATA
for drive in sd{a..z}; do
if [[ -b "/dev/$drive" ]]; then
@@ -19,14 +20,18 @@ start()
# PATA
for drive in hd{a..z}; do
if [[ -b "/dev/$drive" ]]; then
- if [[ "$(cat /proc/ide/$drive/media)" == "cdrom" ]];
+ if [[ -f /proc/ide/$drive/media ]];
then
- $PROGRAM $common_params $pata_cdrom_params
$pata_params "/dev/$drive"
- else
- $PROGRAM $common_params $disk_params
$pata_disk_params $pata_params "/dev/$drive"
+ if [[ "$(cat /proc/ide/$drive/media)" ==
"cdrom" ]];
+ then
+ $PROGRAM $common_params
$pata_cdrom_params $pata_params "/dev/$drive"
+ else
+ $PROGRAM $common_params $disk_params
$pata_disk_params $pata_params "/dev/$drive"
+ fi
fi
fi
done
+ evaluate_retval
}

stop()
diff --git a/disk/hdparm/init.d/hdparm.conf b/disk/hdparm/init.d/hdparm.conf
index ab4754a..1523043 100644
--- a/disk/hdparm/init.d/hdparm.conf
+++ b/disk/hdparm/init.d/hdparm.conf
@@ -1,6 +1,6 @@
# parameters that apply to all drives
#common_params="-K 1"
-common_params=""
+common_params="-q "

# parameters that apply only to harddrives
#disk_params="-A 1 -W 1 -a 2048"
@@ -21,4 +21,3 @@ pata_disk_params=""
# parameters that only apply to pata cdroms
pata_cdrom_params=""

-
diff --git a/mobile/acpi-support/DETAILS b/mobile/acpi-support/DETAILS
index 630fa59..9993854 100755
--- a/mobile/acpi-support/DETAILS
+++ b/mobile/acpi-support/DETAILS
@@ -4,9 +4,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-0.102

SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/a/acpi-support/$SOURCE

SOURCE_HASH=sha512:01c8f16da1c663510c21db862d5a9fbd7275966f03122f61a2a440514b83598cb960809a64c0f5c7a42877c89a98e480250314e98e471ab3e866fade08305674
+ PATCHLEVEL=1
+ LICENSE[0]=GPL
WEB_SITE=http://packages.qa.debian.org/a/acpi-support.html
ENTERED=20071015
- LICENSE=GPL
SHORT="acpi-support include scripts for handling many ACPI events"
cat << EOF
acpi-support contains scripts to react to various ACPI events.
diff --git a/mobile/acpi-support/HISTORY b/mobile/acpi-support/HISTORY
index ccb9d4b..b196468 100644
--- a/mobile/acpi-support/HISTORY
+++ b/mobile/acpi-support/HISTORY
@@ -1,3 +1,10 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Set PATCHLEVEL=1
+ Change LICENSE -> LICENSE[0]
+ * init.d/{acpi-support,vbesave}: Remove force-reload, for some reason
+ it's broken here and gives "not a valid identifier" when the script
+ is run on startup
+
2007-10-17 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: fixup optional_depends and added radeontool

diff --git a/mobile/acpi-support/init.d/acpi-support
b/mobile/acpi-support/init.d/acpi-support
index 4c2d212..00d65d3 100755
--- a/mobile/acpi-support/init.d/acpi-support
+++ b/mobile/acpi-support/init.d/acpi-support
@@ -51,6 +51,3 @@ function restart() {
echo "Unsupported..."
}

-function force-reload() {
- echo "Unsupported..."
-}
diff --git a/mobile/acpi-support/init.d/vbesave
b/mobile/acpi-support/init.d/vbesave
index 151fa7d..0738fe0 100755
--- a/mobile/acpi-support/init.d/vbesave
+++ b/mobile/acpi-support/init.d/vbesave
@@ -60,7 +60,3 @@ function restart ()
echo "Unsupported..."
}

-function force-reload ()
-{
- echo "Unsupported..."
-}
diff --git a/mobile/laptop-mode-tools/DETAILS
b/mobile/laptop-mode-tools/DETAILS
index d902b66..eb4cff6 100755
--- a/mobile/laptop-mode-tools/DETAILS
+++ b/mobile/laptop-mode-tools/DETAILS
@@ -4,9 +4,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://samwel.tk/laptop_mode/tools/downloads/$SOURCE

SOURCE_HASH=sha512:0ce1d8f754dd0764f2222209ddb2c49233ea93498cac92e4179389c904381901066375050c1b565bec5d32a85825ba2d7f9fd3e6c6d70470fb1df4f3f154d052
+ LICENSE[0]=GPL
+ PATCHLEVEL=1
WEB_SITE=http://www.samwel.tk/laptop_mode
ENTERED=20070916
- LICENSE=GPL
SHORT="laptop-mode linux feature tools"
cat << EOF
Laptop Mode Tools is a laptop power saving package for Linux systems. It
allows
diff --git a/mobile/laptop-mode-tools/HISTORY
b/mobile/laptop-mode-tools/HISTORY
index e7cbef7..448a571 100644
--- a/mobile/laptop-mode-tools/HISTORY
+++ b/mobile/laptop-mode-tools/HISTORY
@@ -1,3 +1,16 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Increment PATCHLEVEL
+ Change LICENSE -> LICENSE[0]
+ * init.d/laptop-mode: Remove control characters
+ Remove force-reload, it's causing "not a valid identifier" on boot
+ * laptop-mode-tools-1_34.patch: Add removal of forced script restart
+ during install
+ Do not send SIGHUP to acpid, thus restarting it, during install
+ Do not try to start laptop-mode during install
+ Don't look under /usr/local for modules
+ Change -eq to = and -ne to != in some parts where it complains about
+ expecting an integer when it is receiving an integer, but quoted
+
2007-10-15 Javier Vasquez <jevv.cr AT gmail.com>
* laptop-mode-tools-1_34.patch: Removing
dependency upon LSB, on INIT script...
@@ -16,3 +29,4 @@
2007-05-12 Javier Vasquez <jevv.cr AT gmail.com>
* BUILD, DEPENDS, DETAILS, INSTALL, HISTORY:
created this spell, ver. 1.31
+
diff --git a/mobile/laptop-mode-tools/init.d/laptop-mode
b/mobile/laptop-mode-tools/init.d/laptop-mode
index 826de87..ccdfe74 100755
--- a/mobile/laptop-mode-tools/init.d/laptop-mode
+++ b/mobile/laptop-mode-tools/init.d/laptop-mode
@@ -38,7 +38,7 @@ function restart() {
cat $TEMPFILE

# Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
+ rm -f /var/run/laptop-mode-*
touch /var/run/laptop-mode-enabled
$PROGRAM auto force > $TEMPFILE
cat $TEMPFILE
@@ -51,20 +51,7 @@ function reload() {
cat $TEMPFILE

# Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
- touch /var/run/laptop-mode-enabled
- $PROGRAM auto force > $TEMPFILE
- cat $TEMPFILE
-}
-
-function force-reload() {
- # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
- rm -f /var/run/laptop-mode-enabled
- $PROGRAM stop > $TEMPFILE
- cat $TEMPFILE
-
- # Now remove files containing stored status, re-enable, and start it up
again.
- rm -f /var/run/laptop-mode-*
+ rm -f /var/run/laptop-mode-*
touch /var/run/laptop-mode-enabled
$PROGRAM auto force > $TEMPFILE
cat $TEMPFILE
diff --git a/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
b/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
index b6aab28..794a5e9 100644
--- a/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
+++ b/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
@@ -1,6 +1,6 @@
-diff -Naur laptop-mode-tools-1.34-orig/etc/init.d/laptop-mode
laptop-mode-tools-1.34/etc/init.d/laptop-mode
---- laptop-mode-tools-1.34-orig/etc/init.d/laptop-mode 2007-05-13
09:59:51.000000000 -0600
-+++ laptop-mode-tools-1.34/etc/init.d/laptop-mode 2007-10-15
19:31:06.000000000 -0600
+diff -Naur laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode
laptop-mode-tools-1.34/etc/init.d/laptop-mode
+--- laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode 2007-10-17
20:43:21.952504025 -0700
++++ laptop-mode-tools-1.34/etc/init.d/laptop-mode 2007-10-17
21:01:13.801986666 -0700
@@ -6,9 +6,15 @@
#
# config: /etc/laptop-mode/laptop-mode.conf
@@ -107,9 +107,9 @@ diff -Naur
laptop-mode-tools-1.34-orig/etc/init.d/laptop-mode laptop-mode-tools-
-exit 0
+ $PROGRAM status
+}
-diff -Naur laptop-mode-tools-1.34-orig/install.sh
laptop-mode-tools-1.34/install.sh
---- laptop-mode-tools-1.34-orig/install.sh 2007-05-28 08:54:01.000000000
-0600
-+++ laptop-mode-tools-1.34/install.sh 2007-10-15 19:44:46.000000000 -0600
+diff -Naur laptop-mode-tools-1.34.orig/install.sh
laptop-mode-tools-1.34/install.sh
+--- laptop-mode-tools-1.34.orig/install.sh 2007-10-17 20:43:21.952504025
-0700
++++ laptop-mode-tools-1.34/install.sh 2007-10-17 21:01:13.802986513 -0700
@@ -2,43 +2,9 @@

# If your distribution puts this in other locations, please adjust the
values of
@@ -157,7 +157,25 @@ diff -Naur laptop-mode-tools-1.34-orig/install.sh
laptop-mode-tools-1.34/install

if [ "`whoami`" != "root" ] ; then
echo "You need to be root to install the laptop mode tools."
-@@ -202,31 +168,6 @@
+@@ -49,9 +15,6 @@
+ echo "Warning: the kernel you are running does not support laptop
mode."
+ fi
+
+-echo 'Stopping existing laptop mode service (if any).'
+-$RCPROG $INITSCRIPT stop
+-
+ INSTALL="install -o root -g root"
+
+ mkdir -p /etc/laptop-mode /etc/laptop-mode/batt-start
/etc/laptop-mode/batt-stop /etc/laptop-mode/lm-ac-start
/etc/laptop-mode/lm-ac-stop /etc/laptop-mode/nolm-ac-start
/etc/laptop-mode/nolm-ac-stop /usr/lib/laptop-mode-tools/modules
/etc/laptop-mode/conf.d /etc/laptop-mode/modules
+@@ -147,7 +110,6 @@
+ echo "$0: Failed to install ACPI event file in
/etc/acpi/events. Installation failed."
+ exit 14
+ fi
+- killall -HUP acpid
+ echo "Installed ACPI support."
+ ACPI_DONE=1
+ fi
+@@ -202,31 +164,6 @@
echo "Install either acpid, apmd, pbbuttonsd or pmud (depending on
what your laptop supports) and reinstall."
fi

@@ -189,9 +207,19 @@ diff -Naur laptop-mode-tools-1.34-orig/install.sh
laptop-mode-tools-1.34/install
if ( ! mkdir -p $MAN_D ) ; then
echo "$0: Could not create directory $MAN_D. Installation failed."
exit 22
-diff -Naur laptop-mode-tools-1.34-orig/usr/sbin/laptop_mode
laptop-mode-tools-1.34/usr/sbin/laptop_mode
---- laptop-mode-tools-1.34-orig/usr/sbin/laptop_mode 2007-05-28
09:00:15.000000000 -0600
-+++ laptop-mode-tools-1.34/usr/sbin/laptop_mode 2007-10-15
19:09:48.000000000 -0600
+@@ -236,9 +173,4 @@
+ exit 23
+ fi
+
+-if ( ! $RCPROG $INITSCRIPT start ) ; then
+- echo "$0: Could not start laptop mode init script
/etc/init.d/laptop-mode."
+- exit 24
+-fi
+-
+ echo "Installation complete."
+diff -Naur laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode
laptop-mode-tools-1.34/usr/sbin/laptop_mode
+--- laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode 2007-10-17
20:43:21.952504025 -0700
++++ laptop-mode-tools-1.34/usr/sbin/laptop_mode 2007-10-17
21:02:29.838386836 -0700
@@ -374,18 +374,20 @@


#############################################################################
@@ -225,3 +253,30 @@ diff -Naur
laptop-mode-tools-1.34-orig/usr/sbin/laptop_mode laptop-mode-tools-1.

case "$KLEVEL" in
"2.4" ) ;;
+@@ -787,7 +789,7 @@
+ if [ -f /var/run/laptop-mode-state ] ; then
+ read WAS_ACTIVE WAS_ON_AC WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS <
/var/run/laptop-mode-state
+ if [ "$WAS_ON_AC" != "" ] ; then
+- if [ "$WAS_ACTIVE" -eq "$ACTIVATE" -a "$WAS_ON_AC" -eq
"$ON_AC" -a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -eq
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" -eq 0 ] ; then
++ if [ "$WAS_ACTIVE" = "$ACTIVATE" -a "$WAS_ON_AC" = "$ON_AC"
-a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" =
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" = 0 ] ; then
+ echo -n "$STATE, "
+ if [ "$WAS_ACTIVE" -eq 1 ] ; then
+ echo -n "active [unchanged]"
+@@ -1153,7 +1155,7 @@
+ # Retrieve original non-laptop mode mount
options and restore them.
+ # If the file that stores them doesn't exist,
then laptop mode
+ # has never been started.
+- if [ "$WAS_ACTIVE" -ne 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then

++ if [ "$WAS_ACTIVE" != 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then

+ SAVED_OPTS=`grep "^$DEV "
/var/run/laptop-mode-nolm-mountopts`
+ SAVED_OPTS=${SAVED_OPTS#* } # trim
device name
+
+@@ -1593,7 +1595,7 @@
+ # Finally, call laptop-mode-tools modules. The modules can use the settings
+ # from the INI files, but they may NOT assume the settings actually exist,
+ # as no defaults have been given for them.
+-for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/usr/local/lib/laptop-mode-tools/modules/* /etc/laptop-mode/modules/*; do
++for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/etc/laptop-mode/modules/*; do
+ if [ -e "$SCRIPT" ] ; then
+ "$SCRIPT" >> $OUTPUT
+ else



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (dc9acbd6f6d1ed8daa58661af436951a298aff4d), Eric Sandall, 10/18/2007

Archive powered by MHonArc 2.6.24.

Top of Page