Nochmal 2 Fixes.

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

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index ca34292fec2d7c3f88c3d23ea8ad349a11f9ec44..ccf2ee51026a223d003ab349c7fc0f7e85f935bd 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -34,6 +34,8 @@ $pakfiresettings{'DELPAKS'} = '';
 $pakfiresettings{'AUTOUPDATE'} = 'off';
 $pakfiresettings{'UUID'} = 'on';
 
+system("/usr/local/bin/pakfire update >/dev/null") if not -e "/opt/pakfire/db/lists/packages_list.db";
+
 &Header::getcgihash(\%pakfiresettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);

diff --git a/src/initscripts/init.d/connectd b/src/initscripts/init.d/connectd
index 0be9eb321681f68edd815f5bbed6e18cf352b2fc..b9f0ebb6ad28c469df3ff1d05ad725bff126b179 100644 (file)
--- a/src/initscripts/init.d/connectd
+++ b/src/initscripts/init.d/connectd
@@ -4,6 +4,11 @@
 . /etc/sysconfig/rc 
 . ${rc_functions}
 
+# Stop if nothing is configured
+if [ ! -s "/var/ipfire/ppp/settings" ];then
+ exit 0
+fi
+
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 
 MAX=160
@@ -31,25 +36,25 @@ case "$1" in
        boot_mesg "Starting connection daemon..."
        echo_ok
                
-       while [ "$COUNT" -lt "$MAX" ]; do
-               if [ ! -e "/var/ipfire/red/keepconnected" ]; then
-                       # User pressed disconnect in gui
-                       msg_log "Stopping by user request. Exiting."
-                       /etc/rc.d/init.d/network stop red
-                       exit 0
-               fi
-               if [ -e "/var/ipfire/red/active" ]; then
-                       # Successfully connected in time
-                       echo "0" > /var/ipfire/red/keepconnected
-                       msg_log "System is online. Exiting."; exit 0
-               fi
-               if ( ! ps ax | grep -q [p]ppd ); then
-                       msg_log "No pppd is running. Trying reconnect."
-                       break # because pppd died
-               fi
-               sleep 5
-               (( COUNT+=1 ))
-       done
+               while [ "$COUNT" -lt "$MAX" ]; do
+                       if [ ! -e "/var/ipfire/red/keepconnected" ]; then
+                               # User pressed disconnect in gui
+                               msg_log "Stopping by user request. Exiting."
+                               /etc/rc.d/init.d/network stop red
+                               exit 0
+                       fi
+                       if [ -e "/var/ipfire/red/active" ]; then
+                               # Successfully connected in time
+                               echo "0" > /var/ipfire/red/keepconnected
+                               msg_log "System is online. Exiting."; exit 0
+                       fi
+                       if ( ! ps ax | grep -q [p]ppd ); then
+                               msg_log "No pppd is running. Trying reconnect."
+                               break # because pppd died
+                       fi
+                       sleep 5
+                       (( COUNT+=1 ))
+               done
                
                /etc/rc.d/init.d/network stop red