X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=1580f38d125adb5c35a2fb4bb9cf896597514c7f;hp=ac85fd9b1f6f07ded01171fe5d94a8f57bafa1e0;hb=68b9fb146e8702b2f6a790e3d9486ca36f0d9f76;hpb=69bd31ca5e652942465995e320b7852fc5cf2a06

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index ac85fd9..1580f38 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -13,6 +13,11 @@ set -e
 # visualize chroot inside zsh:
 echo grml_chroot > $target/etc/debian_chroot
 
+HOSTNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+echo "$HOSTNAME" > $target/etc/hostname
+
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Softupdate of FAI via grml-live running"
 
@@ -59,16 +64,16 @@ EOF
    fi
 
    # FAI softupdate does not execute upgrade, so let's do it on our own:
-   $ROOTCMD apt-get update
-   if [ -x $target/usr/bin/aptitude ] ; then
-      if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
-         $ROOTCMD aptitude -y safe-upgrade
-      else
-         $ROOTCMD aptitude -y upgrade
-      fi
-   else
-      $ROOTCMD apt-get -y upgrade
-   fi
+#   $ROOTCMD apt-get update
+#   if [ -x $target/usr/bin/aptitude ] ; then
+#      if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
+#         $ROOTCMD aptitude -y safe-upgrade
+#      else
+#         $ROOTCMD aptitude -y upgrade
+#      fi
+#   else
+#      $ROOTCMD apt-get -y upgrade
+#   fi
 
 else # no softupdate but fresh installation