sdparm eingebaut.

badblocks in die ISO gepackt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@901 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index 6c48ae06f6df121dde0a36b82932748e3e1cbb03..0e31bf17974bb24569994f03580c95539d3713e0 100644 (file)
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -11,14 +11,14 @@ lib/libss.so.2
 lib/libss.so.2.0
 lib/libuuid.so.1
 lib/libuuid.so.1.2
-#sbin/badblocks
-#sbin/blkid
-#sbin/debugfs
-#sbin/dumpe2fs
+sbin/badblocks
+sbin/blkid
+sbin/debugfs
+sbin/dumpe2fs
 sbin/e2fsck
-#sbin/e2image
-#sbin/e2label
-#sbin/findfs
+sbin/e2image
+sbin/e2label
+sbin/findfs
 sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3

diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm
new file mode 100644 (file)
index 0000000..cf5caa5
--- /dev/null
+++ b/config/rootfiles/common/sdparm
@@ -0,0 +1,2 @@
+usr/bin/sdparm
+#usr/man/man8/sdparm.8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b80426b14842921804cda411a06fa9962b3051be..ead2314627532125436b5a7d04d797fe0ad8cb35 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -216,6 +216,7 @@
 * rtorrent-0.7.6
 * samba-3.0.25c
 * screen-4.0.2
+* sdparm-0.90
 * sed-4.1.5
 * setserial-2.17
 * shadow-4.0.15

diff --git a/lfs/sdparm b/lfs/sdparm
new file mode 100644 (file)
index 0000000..875a5f8
--- /dev/null
+++ b/lfs/sdparm
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.90
+
+THISAPP    = sdparm-$(VER)
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7bc85c3e2031493aaaa703cd1a4db0f8
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 332444ad8c9209987930bcec6825700a30df763e..d46770dc9b13b5b599c33982139e2ebe1d3d659d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -387,6 +387,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
+  ipfiremake sdparm
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask

diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index f45b5f8d53c7630de298b42260bd389d1c0f8899..e5024461f17a51703fd614d0feb8f36bf3eec663 100644 (file)
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -2,7 +2,6 @@
 . /opt/pakfire/lib/functions.sh
 
 extract_files
-chown nobody.nobody -Rv /var/ipfire/mpfire
 ln -svf  ../init.d/mpd /etc/rc.d/rc3.d/S65mpd
 ln -svf  ../init.d/mpd /etc/rc.d/rc0.d/K35mpd
 ln -svf  ../init.d/mpd /etc/rc.d/rc6.d/K35mpd

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index 86ec23d48082df5935a294211c8bcf7529d9354a..a99b16a8698b63e7b9853b089f3547726f234ae8 100644 (file)
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -33,7 +33,7 @@ chomp $newdiskstats;
       system("/sbin/hdparm -y /dev/$_");
       system("touch /tmp/hddshutdown-$_");
   }
-  elsif ($diskstatus{$_} ne "0" || $status !=~/standby/){
+  else{
     if ($debug){print "Device ".$_." is active.\n";}
     if ( -e "/tmp/hddshutdown-$_" ) { system("unlink /tmp/hddshutdown-$_"); }
   }