slitaz-boot-scripts diff etc/init.d/system.sh @ rev 416
Use 'action' before 'status' in pair
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Nov 27 12:48:01 2015 +0200 (2015-11-27) |
parents | 6c2d6362887d |
children | 802121f86123 |
line diff
1.1 --- a/etc/init.d/system.sh Mon Mar 23 02:01:21 2015 +0200 1.2 +++ b/etc/init.d/system.sh Fri Nov 27 12:48:01 2015 +0200 1.3 @@ -30,9 +30,10 @@ 1.4 echo -e 'LANG=POSIX\nLC_ALL=POSIX' > /etc/locale.conf 1.5 fi 1.6 . /etc/locale.conf 1.7 -echo -n "Setting system locale: $LANG" 1.8 +action 'Setting system locale: $LANG' 1.9 export LC_ALL=$LANG 1.10 -. /lib/libtaz.sh && status 1.11 +. /lib/libtaz.sh 1.12 +status 1.13 1.14 # Keymap config: Default to us in live mode if kmap= was not used. 1.15 if [ ! -s '/etc/keymap.conf' ]; then 1.16 @@ -40,7 +41,7 @@ 1.17 echo 'us' > /etc/keymap.conf 1.18 fi 1.19 kmap=$(cat /etc/keymap.conf) 1.20 -echo -n "Loading console keymap: $kmap" 1.21 +action 'Loading console keymap: $kmap' 1.22 /sbin/tazkeymap $kmap >/dev/null 1.23 status 1.24 1.25 @@ -69,8 +70,9 @@ 1.26 done 1.27 fi 1.28 if grep -q swap /etc/fstab; then 1.29 - echo -n 'Activating swap memory...' 1.30 - swapon -a && status 1.31 + action 'Activating swap memory...' 1.32 + swapon -a 1.33 + status 1.34 fi 1.35 1.36 # Start TazPanel 1.37 @@ -84,10 +86,10 @@ 1.38 if [ -n "$DRIVER" ]; then 1.39 case "$DRIVER" in 1.40 no) 1.41 - echo -n 'Removing all sound kernel modules...' 1.42 + action 'Removing all sound kernel modules...' 1.43 rm -rf /lib/modules/$(uname -r)/kernel/sound 1.44 status 1.45 - echo -n 'Removing all sound packages...' 1.46 + action 'Removing all sound packages...' 1.47 for i in $(grep -l '^DEPENDS=.*alsa-lib' /var/lib/tazpkg/installed/*/receipt) ; do 1.48 pkg=${i#/var/lib/tazpkg/installed/} 1.49 echo 'y' | tazpkg remove ${pkg%/*} > /dev/null