Sytaxfehler un den ueblichen Sch***

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

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 87cef398cfbc4037e4f2c25be91684bd767ad875..bc77e43dc87bea3cd2ffeae3b5d0f7436b014183 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -23,10 +23,9 @@ usr/local/bin/setxtaccess
 usr/local/bin/smartctrl
 usr/local/bin/snortctrl
 usr/local/bin/squidctrl
-usr/local/bin/sshctrls
+usr/local/bin/sshctrl
 usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl
 usr/local/bin/upnpctrl
 usr/local/bin/wirelessctrl
-

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fb2c2111b6bee73f001c1b0673bae67eb69a9165..cc975f713d884f38b4d339ea6cb143c5b23c5677 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.0t5 ==
+== List of softwares used to build IPFire Version: 2.0beta1 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index cf261d36dd49917484d544dd1a9bbe986193706b..726ada8c522bde72b6127f17823bda260495ea5a 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -18,7 +18,7 @@ done
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
                mount /dev/${DEVICE}1 /cdrom 2> /dev/null
                if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
-                       echo -n ${DEVICE} > /tmp/source_device
+                       echo -n ${DEVICE}1 > /tmp/source_device
                        echo "Found tarball on ${DEVICE}"
                else
                        umount /cdrom 2> /dev/null

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 4e21d7a3cee40ce60ce16c85b1f050e55caac8c4..bb9c4d083d247ee663abe37b4b0e0289ad688262 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -123,7 +123,7 @@ int main(void)
       exit(ERR_CONFIG);
    }
    close(config_fd);
-   if (rename("/etc/syslog.conf.new /etc/syslog.conf") == -1)
+   if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1)
    {
       perror("Unable to replace old config file");
       unlink("/etc/syslog.conf.new");