#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.23-ipfire
-# Mon May 18 14:11:11 2009
+# Linux kernel version: 2.6.27.31
+# Fri Aug 21 16:30:37 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_HIGHPTE is not set
CONFIG_X86_RESERVE_LOW_64K=y
CONFIG_MATH_EMULATION=y
# CONFIG_SONYPI_COMPAT is not set
CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_INTEL_MENLOW=m
-#usr/man/man8/openvpn.8
usr/sbin/openvpn
+#usr/share/doc/openvpn
+#usr/share/man/man8/openvpn.8
var/ipfire/ovpn
var/ipfire/ovpn/ca
var/ipfire/ovpn/caconfig
#usr/etc/rc.d/init.d
#usr/etc/rc.d/init.d/smartd
#usr/etc/smartd.conf
+usr/sbin/smartctl
+#usr/sbin/smartd
+#usr/share/doc/smartmontools-5.39
+#usr/share/doc/smartmontools-5.39/AUTHORS
+#usr/share/doc/smartmontools-5.39/CHANGELOG
+#usr/share/doc/smartmontools-5.39/COPYING
+#usr/share/doc/smartmontools-5.39/INSTALL
+#usr/share/doc/smartmontools-5.39/NEWS
+#usr/share/doc/smartmontools-5.39/README
+#usr/share/doc/smartmontools-5.39/TODO
+#usr/share/doc/smartmontools-5.39/WARNINGS
+#usr/share/doc/smartmontools-5.39/examplescripts
+#usr/share/doc/smartmontools-5.39/examplescripts/Example1
+#usr/share/doc/smartmontools-5.39/examplescripts/Example2
+#usr/share/doc/smartmontools-5.39/examplescripts/Example3
+#usr/share/doc/smartmontools-5.39/examplescripts/Example4
+#usr/share/doc/smartmontools-5.39/examplescripts/README
+#usr/share/doc/smartmontools-5.39/smartd.conf
#usr/man/man5/smartd.conf.5
#usr/man/man8/smartctl.8
#usr/man/man8/smartd.8
-usr/sbin/smartctl
-#usr/sbin/smartd
-#usr/share/doc/smartmontools-5.36
-#usr/share/doc/smartmontools-5.36/AUTHORS
-#usr/share/doc/smartmontools-5.36/CHANGELOG
-#usr/share/doc/smartmontools-5.36/COPYING
-#usr/share/doc/smartmontools-5.36/INSTALL
-#usr/share/doc/smartmontools-5.36/NEWS
-#usr/share/doc/smartmontools-5.36/README
-#usr/share/doc/smartmontools-5.36/TODO
-#usr/share/doc/smartmontools-5.36/WARNINGS
-#usr/share/doc/smartmontools-5.36/examplescripts
-#usr/share/doc/smartmontools-5.36/examplescripts/Example1
-#usr/share/doc/smartmontools-5.36/examplescripts/Example2
-#usr/share/doc/smartmontools-5.36/examplescripts/Example3
-#usr/share/doc/smartmontools-5.36/examplescripts/README
-#usr/share/doc/smartmontools-5.36/smartd.conf
--- /dev/null
+etc/system-release
+boot/grub/grub.conf
--- /dev/null
+usr/sbin/openvpn
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
--- /dev/null
+usr/sbin/smartctl
+etc/rc.d/init.d/smartenabler
+usr/local/bin/smartctrl
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2009 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+#
+KVER="2.6.27.31"
+ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
+MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+#
+# check if we the backup file already exist
+if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
+ echo Moving backup to backup-old ...
+ mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+ /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
+fi
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
+#
+tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+ -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
+echo
+echo Update Kernel to $KVER ...
+# Remove old kernel, configs, initrd, modules ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /lib/modules/
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+ --no-overwrite-dir
+#
+# Modify grub.conf
+#
+echo
+echo Update grub configuration ...
+sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
+sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
+
+if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
+ echo "grub use default console ..."
+else
+ echo "grub use serial console ..."
+ sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
+ sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
+ sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
+ sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
+fi
+#
+# Made emergency - initramdisk
+#
+echo
+echo Create new Initramdisks ...
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+#
+# Made initramdisk
+#
+if [ "${ROOT:0:7}" == "/dev/sd" ]; then
+ # Remove ide hook if root is on sda
+ sed -i "s| ide | |g" /etc/mkinitcpio.conf
+else
+if [ "${ROOT:0:7}" == "/dev/hd" ]; then
+ # Remove pata & sata hook if root is on hda
+ sed -i "s| pata | |g" /etc/mkinitcpio.conf
+ sed -i "s| sata | |g" /etc/mkinitcpio.conf
+fi
+fi
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
+#
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
+#
+# Rebuild Language
+#
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#
+# Add "script-security 3 system" to openvpn config
+#
+if [ ! -s "/var/ipfire/ovpn/server.conf" ]; then
+ grep -q "script-security" /var/ipfire/ovpn/server.conf \
+ || echo "script-security 3 system" >> /var/ipfire/ovpn/server.conf
+fi
+#
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
+# This core-update need a reboot
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 " *** Please reboot... *** "
--- /dev/null
+../../../common/linux
\ No newline at end of file
--- /dev/null
+../../../common/linux-firmware
\ No newline at end of file
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.19
-* alsa-lib-1.0.19-kmod-2.6.27.25-ipfire
+* alsa-lib-1.0.19-kmod-2.6.27.31-ipfire
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
* arping-2.05
* as86-0.16.17
* asterisk-1.4.18
-* atl2-2.0.5-kmod-2.6.27.25-ipfire
-* atl2-2.0.5-kmod-2.6.27.25-ipfire-xen
+* atl2-2.0.5-kmod-2.6.27.31-ipfire
* autoconf-2.59
* automake-1.9.6
* backup-ipfire
* clamav-0.95.2
* cmake-2.4.8
* collectd-4.5.3
-* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire
-* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire-xen
+* compat-wireless-2.6.31-rc7-kmod-2.6.27.31-ipfire
* coreutils-5.96
* cpio-2.6
* cpufrequtils-005
* diffutils-2.8.1
* dnsmasq-2.47
* dosfstools-2.11
-* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire
-* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire-xen
+* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire
* e2fsprogs-1.39
* ebtables-v2.0.8-2
* ed-0.2
* hdparm-8.9
* hostapd-0.6.9
* hplip-2.7.10
-* hso-1.9-kmod-2.6.27.25-ipfire
-* hso-1.9-kmod-2.6.27.25-ipfire-xen
+* hso-1.9-kmod-2.6.27.31-ipfire
* htop-0.8.1
* httpd-2.2.11
* hwdata
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
* kudzu-1.2.64
* l7-protocols-2009-05-10
* lame-3.97
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
-* linux-2.6.27.25-ipfire
-* linux-2.6.27.25-ipfire-xen
+* linux-2.6.27.31-ipfire
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* lm_sensors-3.0.3
* lynis-1.2.6
* lzo-2.02
* m4-1.4.4
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire-xen
+* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire-xen
+* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire
* make-3.81
* man-db-2.4.3
* man-pages-2.34
* openssh-5.2p1
* openssl-0.9.8k
* openswan-2.6.21
-* openswan-2.6.21-kmod-2.6.27.25-ipfire
-* openswan-2.6.21-kmod-2.6.27.25-ipfire-xen
-* openvpn-2.0.9
+* openswan-2.6.21-kmod-2.6.27.31-ipfire
+* openvpn-2.1_rc19
* p7zip_4.65
* pam_mysql-0.7RC1
* patch-2.5.4
* setuptools-0.6c8
* shadow-4.0.15
* slang-1.4.9
-* smartmontools-5.36
+* smartmontools-5.39-svn_r2877
* snort-2.8.4
* sox-12.18.1
* spandsp-0.0.4pre15
* urlgrabber-3.1.0
* usbutils-0.72
* util-linux-2.12r
-* v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire
-* v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire-xen
+* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire
* vdr-1.6.0
* vdradmin-am-3.6.4
* vim-7.0
print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n";
print CONF "proto $sovpnsettings{'DPROTOCOL'}\n";
print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
+ print CONF "script-security 3 system\n";
print CONF "tls-server\n";
print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
VERSUFIX=ipfire
endif
-VER = 2009-06-30
+VER = 2.6.31-rc7
THISAPP = compat-wireless-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 68777ce2aa6b28dc3d37fc2b9a3a6d70
+$(DL_FILE)_MD5 = 3b12d104a64a6bdebf8896d54d9ad7bb
install : $(TARGET)
# Apply some wlan-card patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
-# Build only the modules
+# Enable B43 NPHY / PHY_LP
+ echo "CONFIG_B43_NPHY=y" >> $(DIR_APP)/config.mk
+ echo "CONFIG_B43_PHY_LP=y" >> $(DIR_APP)/config.mk
+
+
+ # This is for stable version
+ # Build only the modules
cd $(DIR_APP) && sed -i -e "s|install: uninstall modules|install: modules|g" Makefile
cd $(DIR_APP) && sed -i -e "s|\t@# All the scripts|\nende:|g" Makefile
cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install
+
+ # This is for new developer versions (New makefile)
+ # cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
+
+ # # The makefile put the modules to a wrong place move back...
+ # cp -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib /
+ # rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib
+
# Xen
ifeq "$(XEN)" "1"
# remove dirty hacks. restores to the status before the dirty hacks
# place of newer kernels and so not overwrite it...
-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
+ -rm -rf $(DIR_APP)
@$(POSTBUILD)
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
- rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,mISDN,source,misc/*,kernel/{sound,drivers/{bluetooth,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
+ rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,mISDN,source,misc/*,kernel/{sound,drivers/{acpi,bluetooth,cpufreq,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
/install/initrd/lib/modules/$(KVER)-ipfire/net/{bridge,netfilter,ipsec}
+ # ... acpi/dock.ko is needed for libata
+ -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
+ cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
+ /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
+
cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
include Config
-PATCHLEVEL = .25
-VER = 2.6.27.25
+PATCHLEVEL = .31
+VER = 2.6.27.31
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
CXXFLAGS =
PROG = linux-xen
-PAK_VER = 4
+PAK_VER = 5
DEPS = ""
# Normal build or XEN build.
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
-$(DL_FILE)_MD5 = 5d6dcff157f30d742c9ee28ad4589779
+$(DL_FILE)_MD5 = b066c348e0fbfa700399d62d2fdfbf11
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
include Config
-VER = 2.0.9
+VER = 2.1_rc19
THISAPP = openvpn-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 60745008b90b7dbe25fe8337c550fec6
+$(DL_FILE)_MD5 = ba2ee667a8b7606b125b7d32f47ca578
install : $(TARGET)
include Config
-VER = 5.36
+VER = 5.39-svn_r2877
THISAPP = smartmontools-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2e424f2d35efa38a29ebca419c1dbe3c
+$(DL_FILE)_MD5 = 62fd73429d5e5295ae42a9dd8a834ddc
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/smartmontools-5.39-error_throw_int.patch
+ cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make BUILD_INFO='"($(NAME) $(VERSION))"' $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.5"
-CORE="30"
+CORE="31"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
ipfiremake pptp
ipfiremake unzip
ipfiremake which
- ipfiremake linux XEN=1
- ipfiremake atl2 XEN=1
- ipfiremake hso XEN=1
- ipfiremake e1000e XEN=1
- ipfiremake kqemu XEN=1
- ipfiremake v4l-dvb XEN=1
- ipfiremake madwifi XEN=1
-# ipfiremake alsa XEN=1 KMOD=1
- ipfiremake openswan XEN=1 KMOD=1
- ipfiremake mISDN XEN=1
- ipfiremake compat-wireless XEN=1
+# ipfiremake linux XEN=1
+# ipfiremake atl2 XEN=1
+# ipfiremake hso XEN=1
+# ipfiremake e1000e XEN=1
+# ipfiremake kqemu XEN=1
+# ipfiremake v4l-dvb XEN=1
+# ipfiremake madwifi XEN=1
+## ipfiremake alsa XEN=1 KMOD=1
+# ipfiremake openswan XEN=1 KMOD=1
+# ipfiremake mISDN XEN=1
+# ipfiremake compat-wireless XEN=1
ipfiremake linux
ipfiremake atl2
ipfiremake hso
ipfirepackages
- # Check if there is a loop device for building in virtual environments
- if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
- cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
- ipfiremake xen-image ED=$IPFVER
- rm -rf $LFS/install/packages/linux-xen-*.ipfire
- fi
- mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+# # Check if there is a loop device for building in virtual environments
+# if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+# cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+# ipfiremake xen-image ED=$IPFVER
+# rm -rf $LFS/install/packages/linux-xen-*.ipfire
+# fi
+# mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
# Cleanup
stdumount
start)
boot_mesg -n "Enabling S.M.A.R.T.: ";
for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do
- /usr/sbin/smartctl -d ata --smart=on /dev/$disk > /dev/nul;
+ /usr/sbin/smartctl --smart=on /dev/$disk > /dev/nul;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$disk$NORMAL ";
else
exit(1);
}
- sprintf(command, "smartctl -iHA -d ata /dev/%s", argv[1]);
+ sprintf(command, "smartctl -iHA /dev/%s", argv[1]);
safe_system(command);
return 0;
--- /dev/null
+diff -Naur smartmontools-5.39-svn_r2877/utility.h smartmontools-5.39-svn_r2877.new/utility.h
+--- smartmontools-5.39-svn_r2877/utility.h 2009-08-24 12:48:50.000000000 +0200
++++ smartmontools-5.39-svn_r2877.new/utility.h 2009-08-29 09:11:07.000000000 +0200
+@@ -102,7 +102,11 @@
+
+ // Replacement for exit(status)
+ // (exit is not compatible with C++ destructors)
+-#define EXIT(status) { throw (int)(status); }
++
++//This doesn't work on IPFire.
++//#define EXIT(status) { throw (int)(status); }
++//tried to use exit and found no problems yet
++#define EXIT(status) { exit ((int)(status)); }
+
+
+ #ifdef OLD_INTERFACE
if (!$standby){
$temp = 0;
my $smart_output = '';
- system("$path_smartctl -iHA -d ata /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
+ system("$path_smartctl -iHA /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
if ( -e "/var/run/smartctl_out_hddtemp-".$array[$#array] ){
my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
my @t = split(/\s+/,$hdd_output);
projects / people / teissler / ipfire-2.x.git / commitdiff
