[Lunar-commits] <lunar-iso> lunar-install: minor fixes

[Stefan Wold]

commit 7bb580b7f3786b3b7534128577874d402209619c
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Mon, 25 Nov 2013 12:30:14 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/7bb580b7f3786b3b7534128577874d402209619c

lunar-install: minor fixes

- disable services not needed unless user choose to enable them
- set kernel_headers alias default to kernel-headers
- print an infobox when kernel is being installed
---
  lunar-install/sbin/lunar-install | +8/-7     
  1 file changed, 8 insertions(+), 7 deletions(-)

--- a/lunar-install/sbin/lunar-install
+++ b/lunar-install/sbin/lunar-install
@@ -1182,15 +1182,17 @@ transfer()
       cp /etc/issue{,.net} $TARGET/etc/
 
       # Some sane defaults
-      GCC_VER=$(chroot_run lsh installed_version gcc)
-      GCC_VER=${GCC_VER%.*}
       cat <<EOF> $TARGET/etc/lunar/local/config
-  LUNAR_COMPILER="GCC_${GCC_VER/./_}"
     LUNAR_MODULE="lunar"
 LUNAR_ALIAS_UDEV="systemd"
 LUNAR_ALIAS_KMOD="kmod"
+LUNAR_ALIAS_KERNEL_HEADERS="kernel-headers"
 EOF
 
+      # Disable services (user can choose to enable them using services menu)
+      rm -f $TARGET/etc/systemd/system/network.target.wants/wpa_supplicant.service
+      rm -f $TARGET/etc/systemd/system/sockets.target.wants/sshd.socket
+
       # root user skel files
       find $TARGET/etc/skel ! -type d | xargs -i cp '{}' $TARGET/root
 
@@ -1493,9 +1495,8 @@ install_kernels()
             $(list_precompiled_kernels)`
         fi
         if [ -f "/var/cache/lunar/$CCOMMAND.tar.xz" ]; then
-          clear
-          echo "Installing kernel, please wait..."
-          cd $TARGET && tar xJf /var/cache/lunar/$CCOMMAND.tar.xz &> /dev/null
+          $DIALOG --infobox "\nInstalling kernel $CCOMMAND, please wait..." 5 70
+          cd $TARGET && tar xf /var/cache/lunar/$CCOMMAND.tar.xz &> /dev/null
           chroot_run cp /usr/src/linux/.config /etc/lunar/local/.config.current
 
           KVER=$(grep "^$CCOMMAND:" $KERNEL_LIST | cut -d: -f2)
@@ -1515,7 +1516,7 @@ install_kernels()
 
           # let the plugin code handle the hard work
           chroot_run depmod
-          chroot_run lsh update_bootloader $KVER_FULL $KVER &> /dev/null
+          chroot_run lsh update_bootloader $KVER_FULL $KVER
 
           msgbox "The precompiled kernel \"$CCOMMAND\" has been installed to your system."
           if (( STEP == 8 )); then