slitaz-boot-scripts rev 210
merge
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun Apr 18 23:18:53 2010 +0200 (2010-04-18) |
parents | 7de49175aae7 28a1f75bbe37 |
children | 98de454a7e21 |
files |
line diff
1.1 --- a/etc/init.d/network.sh Sun Mar 28 00:36:44 2010 +0100 1.2 +++ b/etc/init.d/network.sh Sun Apr 18 23:18:53 2010 +0200 1.3 @@ -192,7 +192,8 @@ 1.4 dhcp 1.5 static_ip 1.6 # change default lxpanel panel iface 1.7 - sed -i "s/iface=.*/iface=$INTERFACE/" /etc/lxpanel/default/panels/panel 1.8 + [ -f /etc/lxpanel/default/panels/panel ] \ 1.9 + && sed -i "s/iface=.*/iface=$INTERFACE/" /etc/lxpanel/default/panels/panel 1.10 } 1.11 1.12
2.1 --- a/etc/init.d/rc.functions Sun Mar 28 00:36:44 2010 +0100 2.2 +++ b/etc/init.d/rc.functions Sun Apr 18 23:18:53 2010 +0200 2.3 @@ -33,7 +33,7 @@ 2.4 if [ ! -e $1 ]; then 2.5 return 1 2.6 elif grep -qs "Name:.$(basename $2)$" \ 2.7 - /proc/$(sed 's/[^0-9]//g' < $1 | head -1)/status ; then 2.8 + /proc/$(sed 's/[^0-9]//g' < $1 | head -n 1)/status ; then 2.9 return 0 2.10 else 2.11 rm -f $1
3.1 --- a/etc/init.d/rcS Sun Mar 28 00:36:44 2010 +0100 3.2 +++ b/etc/init.d/rcS Sun Apr 18 23:18:53 2010 +0200 3.3 @@ -115,7 +115,7 @@ 3.4 if [ -n "$CDROM" ]; then 3.5 DRIVE_NAME=${CDROM#/dev/} 3.6 else 3.7 - DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3` 3.8 + DRIVE_NAME=`grep -s "drive name" /proc/sys/dev/cdrom/info | cut -f 3` 3.9 fi 3.10 if [ -n "$DRIVE_NAME" -a ! "`readlink /dev/cdrom`" ]; then 3.11 echo -n "Creating symlink : /dev/cdrom..."