slitaz-tools rev 932
tazx init():Do not install "slitaz-configs" with its huge depends while booting base flavor
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Thu Dec 18 21:46:43 2014 +0000 (2014-12-18) |
parents | 53389b39eefd |
children | a14efe47926c |
files | tinyutils/tazx |
line diff
1.1 --- a/tinyutils/tazx Mon Dec 01 21:08:35 2014 +0000 1.2 +++ b/tinyutils/tazx Thu Dec 18 21:46:43 2014 +0000 1.3 @@ -180,7 +180,7 @@ 1.4 1.5 status 1.6 [ -z "$variant" ] && sed -i '/XkbVariant/d' $keyboard_config 1.7 - xkb 1.8 + [ -z $(busybox which lxpanel) ] || xkb 1.9 } 1.10 1.11 1.12 @@ -472,8 +472,8 @@ 1.13 1.14 slitaz_apps_conf() { 1.15 apps_conf=/etc/slitaz/applications.conf 1.16 - [ -f $apps_conf ] || inst_pkg slitaz-configs --forced 1.17 1.18 +if [ -f $apps_conf ]; then 1.19 if [ "$(id -u)" = 0 ]; then 1.20 user_conf=$apps_conf 1.21 new_user_conf="/etc/skel/.config/slitaz/applications.conf" 1.22 @@ -487,6 +487,9 @@ 1.23 cp $apps_conf $user_conf 1.24 fi 1.25 fi 1.26 +else 1.27 + [ "$1" == 'init' ] || inst_pkg slitaz-configs --forced 1.28 +fi 1.29 1.30 [ -f "$HOME/.xinitrc" ] || inst_pkg slitaz-configs-base --forced 1.31 } 1.32 @@ -515,7 +518,7 @@ 1.33 # We don't need much config files with last Xorg version, So just 1.34 # get files for starting an X session and config the keyboard. 1.35 check_root 1.36 - slitaz_apps_conf 1.37 + slitaz_apps_conf init 1.38 keyboard_conf 1.39 gen_xorg_conf_file ;; 1.40